Update RI structures

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java

@@ -143,7 +143,7 @@ public class FhirValidator {
 	public void validate(Bundle theBundle) {
 		Validate.notNull(theBundle, "theBundle must not be null");
 
-		ValidationContext<Bundle> ctx = ValidationContext.forBundle(myContext, theBundle);
+		IValidationContext<Bundle> ctx = ValidationContext.forBundle(myContext, theBundle);
 
 		for (IValidator next : myValidators) {
 			next.validateBundle(ctx);
@@ -184,7 +184,7 @@ public class FhirValidator {
     public ValidationResult validateWithResult(Bundle theBundle) {
         Validate.notNull(theBundle, "theBundle must not be null");
 
-        ValidationContext<Bundle> ctx = ValidationContext.forBundle(myContext, theBundle);
+        IValidationContext<Bundle> ctx = ValidationContext.forBundle(myContext, theBundle);
 
 		for (IValidator next : myValidators) {
 			next.validateBundle(ctx);
@@ -204,7 +204,7 @@ public class FhirValidator {
     public ValidationResult validateWithResult(IBaseResource theResource) {
         Validate.notNull(theResource, "theResource must not be null");
 
-        ValidationContext<IBaseResource> ctx = ValidationContext.forResource(myContext, theResource);
+        IValidationContext<IBaseResource> ctx = ValidationContext.forResource(myContext, theResource);
 
         for (IValidator next : myValidators) {
             next.validateResource(ctx);

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java

@@ -0,0 +1,17 @@
+package ca.uhn.fhir.validation;
+
+import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
+
+import ca.uhn.fhir.context.FhirContext;
+
+interface IValidationContext<T> {
+
+	public abstract FhirContext getFhirContext();
+
+	public abstract IBaseOperationOutcome getOperationOutcome();
+
+	public abstract T getResource();
+
+	public abstract String getXmlEncodedResource();
+
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidator.java

@@ -4,6 +4,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.model.api.Bundle;
 
+
 /*
  * #%L
  * HAPI FHIR - Core Library
@@ -24,11 +25,13 @@ import ca.uhn.fhir.model.api.Bundle;
  * #L%
  */
 
+/**
+ * Registers 
+ */
+public interface IValidator {
 
-interface IValidator {
+	void validateResource(IValidationContext<IBaseResource> theCtx);
 
-	void validateResource(ValidationContext<IBaseResource> theCtx);
-
-	void validateBundle(ValidationContext<Bundle> theContext);
+	void validateBundle(IValidationContext<Bundle> theContext);
 
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java

@@ -49,7 +49,6 @@ import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.model.api.Bundle;
-import ca.uhn.fhir.model.base.resource.BaseOperationOutcome.BaseIssue;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.util.OperationOutcomeUtil;
 
@@ -77,7 +76,7 @@ class SchemaBaseValidator implements IValidator {
 		myCtx = theContext;
 	}
 
-	private void doValidate(ValidationContext<?> theContext, String schemaName) {
+	private void doValidate(IValidationContext<?> theContext, String schemaName) {
 		Schema schema = loadSchema("dstu", schemaName);
 
 		try {
@@ -148,7 +147,7 @@ class SchemaBaseValidator implements IValidator {
 	}
 
 	@Override
-	public void validateBundle(ValidationContext<Bundle> theContext) {
+	public void validateBundle(IValidationContext<Bundle> theContext) {
 		if (myCtx.getVersion().getVersion().isNewerThan(FhirVersionEnum.DSTU1)) {
 			doValidate(theContext, "fhir-single.xsd");
 		} else {
@@ -157,15 +156,15 @@ class SchemaBaseValidator implements IValidator {
 	}
 
 	@Override
-	public void validateResource(ValidationContext<IBaseResource> theContext) {
+	public void validateResource(IValidationContext<IBaseResource> theContext) {
 		doValidate(theContext, "fhir-single.xsd");
 	}
 
 	private static class MyErrorHandler implements org.xml.sax.ErrorHandler {
 
-		private ValidationContext<?> myContext;
+		private IValidationContext<?> myContext;
 
-		public MyErrorHandler(ValidationContext<?> theContext) {
+		public MyErrorHandler(IValidationContext<?> theContext) {
 			myContext = theContext;
 		}
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchematronBaseValidator.java

@@ -53,7 +53,7 @@ public class SchematronBaseValidator implements IValidator {
 	}
 
 	@Override
-	public void validateResource(ValidationContext<IBaseResource> theCtx) {
+	public void validateResource(IValidationContext<IBaseResource> theCtx) {
 
 		ISchematronResource sch = getSchematron(theCtx);
 		StreamSource source = new StreamSource(new StringReader(theCtx.getXmlEncodedResource()));
@@ -93,14 +93,14 @@ public class SchematronBaseValidator implements IValidator {
 
 	}
 
-	private ISchematronResource getSchematron(ValidationContext<IBaseResource> theCtx) {
+	private ISchematronResource getSchematron(IValidationContext<IBaseResource> theCtx) {
 		Class<? extends IBaseResource> resource = theCtx.getResource().getClass();
 		Class<? extends IBaseResource> baseResourceClass = theCtx.getFhirContext().getResourceDefinition(resource).getBaseDefinition().getImplementingClass();
 
 		return getSchematronAndCache(theCtx, "dstu", baseResourceClass);
 	}
 
-	private ISchematronResource getSchematronAndCache(ValidationContext<IBaseResource> theCtx, String theVersion, Class<? extends IBaseResource> theClass) {
+	private ISchematronResource getSchematronAndCache(IValidationContext<IBaseResource> theCtx, String theVersion, Class<? extends IBaseResource> theClass) {
 		synchronized (myClassToSchematron) {
 			ISchematronResource retVal = myClassToSchematron.get(theClass);
 			if (retVal != null) {
@@ -122,10 +122,10 @@ public class SchematronBaseValidator implements IValidator {
 	}
 
 	@Override
-	public void validateBundle(ValidationContext<Bundle> theContext) {
+	public void validateBundle(IValidationContext<Bundle> theContext) {
 		for (BundleEntry next : theContext.getResource().getEntries()) {
 			if (next.getResource() != null) {
-				ValidationContext<IBaseResource> ctx = ValidationContext.newChild(theContext, next.getResource());
+				IValidationContext<IBaseResource> ctx = ValidationContext.newChild(theContext, next.getResource());
 				validateResource(ctx);
 			}
 		}

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java

@@ -27,24 +27,33 @@ import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.Bundle;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 
-class ValidationContext<T> {
+class ValidationContext<T> implements IValidationContext<T> {
 
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ValidationContext.class);
 	private final IEncoder myEncoder;
 	private final FhirContext myFhirContext;
 	private IBaseOperationOutcome myOperationOutcome;
 	private final T myResource;
 	private String myXmlEncodedResource;
-private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ValidationContext.class);
+
 	private ValidationContext(FhirContext theContext, T theResource, IEncoder theEncoder) {
 		myFhirContext = theContext;
 		myResource = theResource;
 		myEncoder = theEncoder;
 	}
 
+	/* (non-Javadoc)
+	 * @see ca.uhn.fhir.validation.IValidationContext#getFhirContext()
+	 */
+	@Override
 	public FhirContext getFhirContext() {
 		return myFhirContext;
 	}
 
+	/* (non-Javadoc)
+	 * @see ca.uhn.fhir.validation.IValidationContext#getOperationOutcome()
+	 */
+	@Override
 	public IBaseOperationOutcome getOperationOutcome() {
 		if (myOperationOutcome == null) {
 			try {
@@ -57,10 +66,18 @@ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger
 		return myOperationOutcome;
 	}
 
+	/* (non-Javadoc)
+	 * @see ca.uhn.fhir.validation.IValidationContext#getResource()
+	 */
+	@Override
 	public T getResource() {
 		return myResource;
 	}
 
+	/* (non-Javadoc)
+	 * @see ca.uhn.fhir.validation.IValidationContext#getXmlEncodedResource()
+	 */
+	@Override
 	public String getXmlEncodedResource() {
 		if (myXmlEncodedResource == null) {
 			myXmlEncodedResource = myEncoder.encode();
@@ -68,7 +85,7 @@ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger
 		return myXmlEncodedResource;
 	}
 
-	public static ValidationContext<Bundle> forBundle(final FhirContext theContext, final Bundle theBundle) {
+	public static IValidationContext<Bundle> forBundle(final FhirContext theContext, final Bundle theBundle) {
 		return new ValidationContext<Bundle>(theContext, theBundle, new IEncoder() {
 			@Override
 			public String encode() {
@@ -77,7 +94,7 @@ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger
 		});
 	}
 
-	public static <T extends IBaseResource> ValidationContext<T> forResource(final FhirContext theContext, final T theResource) {
+	public static <T extends IBaseResource> IValidationContext<T> forResource(final FhirContext theContext, final T theResource) {
 		return new ValidationContext<T>(theContext, theResource, new IEncoder() {
 			@Override
 			public String encode() {
@@ -86,8 +103,8 @@ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger
 		});
 	}
 
-	public static ValidationContext<IBaseResource> newChild(ValidationContext<Bundle> theContext, IBaseResource theResource) {
-		ValidationContext<IBaseResource> retVal = forResource(theContext.getFhirContext(), theResource);
+	public static IValidationContext<IBaseResource> newChild(IValidationContext<Bundle> theContext, IBaseResource theResource) {
+		ValidationContext<IBaseResource> retVal = (ValidationContext<IBaseResource>) forResource(theContext.getFhirContext(), theResource);
 		retVal.myOperationOutcome = theContext.getOperationOutcome();
 		return retVal;
 	}

hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/CreateTest.java

@@ -91,6 +91,50 @@ public class CreateTest {
 		
 	}
 
+	@Test
+	public void testCreateWithWrongContentTypeXml() throws Exception {
+
+		Patient patient = new Patient();
+		patient.addIdentifier().setValue("001");
+		patient.addIdentifier().setValue("002");
+
+		HttpPost httpPost = new HttpPost("http://localhost:" + ourPort + "/Patient");
+		String inputString = ourCtx.newJsonParser().encodeResourceToString(patient);
+		ContentType inputCt = ContentType.create(Constants.CT_FHIR_XML, "UTF-8");
+		httpPost.setEntity(new StringEntity(inputString, inputCt));
+
+		HttpResponse status = ourClient.execute(httpPost);
+
+		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		ourLog.info("Response was:\n{}", responseContent);
+
+		assertEquals(500, status.getStatusLine().getStatusCode());
+		assertThat(responseContent, containsString("Unexpected character"));
+	}
+
+	@Test
+	public void testCreateWithWrongContentTypeJson() throws Exception {
+
+		Patient patient = new Patient();
+		patient.addIdentifier().setValue("001");
+		patient.addIdentifier().setValue("002");
+
+		HttpPost httpPost = new HttpPost("http://localhost:" + ourPort + "/Patient");
+		String inputString = ourCtx.newXmlParser().encodeResourceToString(patient);
+		ContentType inputCt = ContentType.create(Constants.CT_FHIR_JSON, "UTF-8");
+		httpPost.setEntity(new StringEntity(inputString, inputCt));
+
+		HttpResponse status = ourClient.execute(httpPost);
+
+		String responseContent = IOUtils.toString(status.getEntity().getContent());
+		IOUtils.closeQuietly(status.getEntity().getContent());
+		ourLog.info("Response was:\n{}", responseContent);
+
+		assertEquals(500, status.getStatusLine().getStatusCode());
+		assertThat(responseContent, containsString("Unexpected char"));
+	}
+
 	@Test
 	public void testCreateById() throws Exception {
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java

@@ -20,7 +20,8 @@ package ca.uhn.fhir.rest.server.provider.dstu2hl7org;
  * #L%
  */
 
-import static org.apache.commons.lang3.StringUtils.*;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.util.ArrayList;
 import java.util.Collections;

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/formats/JsonParser.java

@@ -0,0 +1,12 @@
+package org.hl7.fhir.instance.formats;
+
+import org.hl7.fhir.instance.model.Type;
+
+public class JsonParser {
+
+	public String composeString(Type theValue, Object theObject) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java

@@ -0,0 +1,705 @@
+package org.hl7.fhir.instance.model;
+
+/*
+  Copyright (c) 2011+, HL7, Inc.
+  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without modification, 
+  are permitted provided that the following conditions are met:
+  
+   * Redistributions of source code must retain the above copyright notice, this 
+     list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright notice, 
+     this list of conditions and the following disclaimer in the documentation 
+     and/or other materials provided with the distribution.
+   * Neither the name of HL7 nor the names of its contributors may be used to 
+     endorse or promote products derived from this software without specific 
+     prior written permission.
+  
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+  POSSIBILITY OF SUCH DAMAGE.
+  
+*/
+
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+
+import java.util.*;
+
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.instance.model.annotations.ResourceDef;
+import org.hl7.fhir.instance.model.annotations.SearchParamDefinition;
+import org.hl7.fhir.instance.model.annotations.Child;
+import org.hl7.fhir.instance.model.annotations.Description;
+import org.hl7.fhir.instance.model.annotations.Block;
+import org.hl7.fhir.instance.model.api.*;
+/**
+ * A financial tool for tracking value accrued for a particular purpose.  In the healthcare field, used to track charges for a patient, cost centres, etc.
+ */
+@ResourceDef(name="Account", profile="http://hl7.org/fhir/Profile/Account")
+public class Account extends DomainResource {
+
+    public enum AccountStatus {
+        /**
+         * This account is active and may be used
+         */
+        ACTIVE, 
+        /**
+         * This account is inactive and should not be used to track financial information
+         */
+        INACTIVE, 
+        /**
+         * added to help the parsers
+         */
+        NULL;
+        public static AccountStatus fromCode(String codeString) throws Exception {
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("active".equals(codeString))
+          return ACTIVE;
+        if ("inactive".equals(codeString))
+          return INACTIVE;
+        throw new Exception("Unknown AccountStatus code '"+codeString+"'");
+        }
+        public String toCode() {
+          switch (this) {
+            case ACTIVE: return "active";
+            case INACTIVE: return "inactive";
+            default: return "?";
+          }
+        }
+        public String getSystem() {
+          switch (this) {
+            case ACTIVE: return "http://hl7.org/fhir/account-status";
+            case INACTIVE: return "http://hl7.org/fhir/account-status";
+            default: return "?";
+          }
+        }
+        public String getDefinition() {
+          switch (this) {
+            case ACTIVE: return "This account is active and may be used";
+            case INACTIVE: return "This account is inactive and should not be used to track financial information";
+            default: return "?";
+          }
+        }
+        public String getDisplay() {
+          switch (this) {
+            case ACTIVE: return "Active";
+            case INACTIVE: return "Inactive";
+            default: return "?";
+          }
+        }
+    }
+
+  public static class AccountStatusEnumFactory implements EnumFactory<AccountStatus> {
+    public AccountStatus fromCode(String codeString) throws IllegalArgumentException {
+      if (codeString == null || "".equals(codeString))
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("active".equals(codeString))
+          return AccountStatus.ACTIVE;
+        if ("inactive".equals(codeString))
+          return AccountStatus.INACTIVE;
+        throw new IllegalArgumentException("Unknown AccountStatus code '"+codeString+"'");
+        }
+    public String toCode(AccountStatus code) {
+      if (code == AccountStatus.ACTIVE)
+        return "active";
+      if (code == AccountStatus.INACTIVE)
+        return "inactive";
+      return "?";
+      }
+    }
+
+    /**
+     * Unique identifier used to reference the account.  May or may not be intended for human use.  (E.g. credit card number).
+     */
+    @Child(name = "identifier", type = {Identifier.class}, order=0, min=0, max=Child.MAX_UNLIMITED)
+    @Description(shortDefinition="Account number", formalDefinition="Unique identifier used to reference the account.  May or may not be intended for human use.  (E.g. credit card number)." )
+    protected List<Identifier> identifier;
+
+    /**
+     * Name used for the account when displaying it to humans in reports, etc.
+     */
+    @Child(name = "name", type = {StringType.class}, order=1, min=0, max=1)
+    @Description(shortDefinition="Human-readable label", formalDefinition="Name used for the account when displaying it to humans in reports, etc." )
+    protected StringType name;
+
+    /**
+     * Categorizes the account for reporting and searching purposes.
+     */
+    @Child(name = "type", type = {CodeableConcept.class}, order=2, min=0, max=1)
+    @Description(shortDefinition="E.g. patient, expense, depreciation", formalDefinition="Categorizes the account for reporting and searching purposes." )
+    protected CodeableConcept type;
+
+    /**
+     * Indicates whether the account is presently used/useable or not.
+     */
+    @Child(name = "status", type = {CodeType.class}, order=3, min=0, max=1)
+    @Description(shortDefinition="active | inactive", formalDefinition="Indicates whether the account is presently used/useable or not." )
+    protected Enumeration<AccountStatus> status;
+
+    /**
+     * Indicates the period of time over which the account is allowed.
+     */
+    @Child(name = "activePeriod", type = {Period.class}, order=4, min=0, max=1)
+    @Description(shortDefinition="Valid from..to", formalDefinition="Indicates the period of time over which the account is allowed." )
+    protected Period activePeriod;
+
+    /**
+     * Identifies the currency to which transactions must be converted when crediting or debiting the account.
+     */
+    @Child(name = "currency", type = {Coding.class}, order=5, min=0, max=1)
+    @Description(shortDefinition="Base currency in which balance is tracked", formalDefinition="Identifies the currency to which transactions must be converted when crediting or debiting the account." )
+    protected Coding currency;
+
+    /**
+     * Represents the sum of all credits less all debits associated with the account.  Might be positive, zero or negative.
+     */
+    @Child(name = "balance", type = {Money.class}, order=6, min=0, max=1)
+    @Description(shortDefinition="How much is in account?", formalDefinition="Represents the sum of all credits less all debits associated with the account.  Might be positive, zero or negative." )
+    protected Money balance;
+
+    /**
+     * Identifies the period of time the account applies to.  E.g. accounts created per fiscal year, quarter, etc.
+     */
+    @Child(name = "coveragePeriod", type = {Period.class}, order=7, min=0, max=1)
+    @Description(shortDefinition="Transaction window", formalDefinition="Identifies the period of time the account applies to.  E.g. accounts created per fiscal year, quarter, etc." )
+    protected Period coveragePeriod;
+
+    /**
+     * Identifies the patient, device, practitioner, location or other object the account is associated with.
+     */
+    @Child(name = "subject", type = {Patient.class, Device.class, Practitioner.class, Location.class, HealthcareService.class, Organization.class}, order=8, min=0, max=1)
+    @Description(shortDefinition="What is account tied to?", formalDefinition="Identifies the patient, device, practitioner, location or other object the account is associated with." )
+    protected Reference subject;
+
+    /**
+     * The actual object that is the target of the reference (Identifies the patient, device, practitioner, location or other object the account is associated with.)
+     */
+    protected Resource subjectTarget;
+
+    /**
+     * Indicates the organization, department, etc. with responsibility for the account.
+     */
+    @Child(name = "owner", type = {Organization.class}, order=9, min=0, max=1)
+    @Description(shortDefinition="Who is responsible?", formalDefinition="Indicates the organization, department, etc. with responsibility for the account." )
+    protected Reference owner;
+
+    /**
+     * The actual object that is the target of the reference (Indicates the organization, department, etc. with responsibility for the account.)
+     */
+    protected Organization ownerTarget;
+
+    /**
+     * Provides additional information about what the account tracks and how it is used.
+     */
+    @Child(name = "description", type = {StringType.class}, order=10, min=0, max=1)
+    @Description(shortDefinition="Explanation of purpose/use", formalDefinition="Provides additional information about what the account tracks and how it is used." )
+    protected StringType description;
+
+    private static final long serialVersionUID = -1926153194L;
+
+  /*
+   * Constructor
+   */
+    public Account() {
+      super();
+    }
+
+    /**
+     * @return {@link #identifier} (Unique identifier used to reference the account.  May or may not be intended for human use.  (E.g. credit card number).)
+     */
+    public List<Identifier> getIdentifier() { 
+      if (this.identifier == null)
+        this.identifier = new ArrayList<Identifier>();
+      return this.identifier;
+    }
+
+    public boolean hasIdentifier() { 
+      if (this.identifier == null)
+        return false;
+      for (Identifier item : this.identifier)
+        if (!item.isEmpty())
+          return true;
+      return false;
+    }
+
+    /**
+     * @return {@link #identifier} (Unique identifier used to reference the account.  May or may not be intended for human use.  (E.g. credit card number).)
+     */
+    // syntactic sugar
+    public Identifier addIdentifier() { //3
+      Identifier t = new Identifier();
+      if (this.identifier == null)
+        this.identifier = new ArrayList<Identifier>();
+      this.identifier.add(t);
+      return t;
+    }
+
+    // syntactic sugar
+    public Account addIdentifier(Identifier t) { //3
+      if (t == null)
+        return this;
+      if (this.identifier == null)
+        this.identifier = new ArrayList<Identifier>();
+      this.identifier.add(t);
+      return this;
+    }
+
+    /**
+     * @return {@link #name} (Name used for the account when displaying it to humans in reports, etc.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+     */
+    public StringType getNameElement() { 
+      if (this.name == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.name");
+        else if (Configuration.doAutoCreate())
+          this.name = new StringType(); // bb
+      return this.name;
+    }
+
+    public boolean hasNameElement() { 
+      return this.name != null && !this.name.isEmpty();
+    }
+
+    public boolean hasName() { 
+      return this.name != null && !this.name.isEmpty();
+    }
+
+    /**
+     * @param value {@link #name} (Name used for the account when displaying it to humans in reports, etc.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+     */
+    public Account setNameElement(StringType value) { 
+      this.name = value;
+      return this;
+    }
+
+    /**
+     * @return Name used for the account when displaying it to humans in reports, etc.
+     */
+    public String getName() { 
+      return this.name == null ? null : this.name.getValue();
+    }
+
+    /**
+     * @param value Name used for the account when displaying it to humans in reports, etc.
+     */
+    public Account setName(String value) { 
+      if (Utilities.noString(value))
+        this.name = null;
+      else {
+        if (this.name == null)
+          this.name = new StringType();
+        this.name.setValue(value);
+      }
+      return this;
+    }
+
+    /**
+     * @return {@link #type} (Categorizes the account for reporting and searching purposes.)
+     */
+    public CodeableConcept getType() { 
+      if (this.type == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.type");
+        else if (Configuration.doAutoCreate())
+          this.type = new CodeableConcept(); // cc
+      return this.type;
+    }
+
+    public boolean hasType() { 
+      return this.type != null && !this.type.isEmpty();
+    }
+
+    /**
+     * @param value {@link #type} (Categorizes the account for reporting and searching purposes.)
+     */
+    public Account setType(CodeableConcept value) { 
+      this.type = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #status} (Indicates whether the account is presently used/useable or not.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
+     */
+    public Enumeration<AccountStatus> getStatusElement() { 
+      if (this.status == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.status");
+        else if (Configuration.doAutoCreate())
+          this.status = new Enumeration<AccountStatus>(new AccountStatusEnumFactory()); // bb
+      return this.status;
+    }
+
+    public boolean hasStatusElement() { 
+      return this.status != null && !this.status.isEmpty();
+    }
+
+    public boolean hasStatus() { 
+      return this.status != null && !this.status.isEmpty();
+    }
+
+    /**
+     * @param value {@link #status} (Indicates whether the account is presently used/useable or not.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
+     */
+    public Account setStatusElement(Enumeration<AccountStatus> value) { 
+      this.status = value;
+      return this;
+    }
+
+    /**
+     * @return Indicates whether the account is presently used/useable or not.
+     */
+    public AccountStatus getStatus() { 
+      return this.status == null ? null : this.status.getValue();
+    }
+
+    /**
+     * @param value Indicates whether the account is presently used/useable or not.
+     */
+    public Account setStatus(AccountStatus value) { 
+      if (value == null)
+        this.status = null;
+      else {
+        if (this.status == null)
+          this.status = new Enumeration<AccountStatus>(new AccountStatusEnumFactory());
+        this.status.setValue(value);
+      }
+      return this;
+    }
+
+    /**
+     * @return {@link #activePeriod} (Indicates the period of time over which the account is allowed.)
+     */
+    public Period getActivePeriod() { 
+      if (this.activePeriod == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.activePeriod");
+        else if (Configuration.doAutoCreate())
+          this.activePeriod = new Period(); // cc
+      return this.activePeriod;
+    }
+
+    public boolean hasActivePeriod() { 
+      return this.activePeriod != null && !this.activePeriod.isEmpty();
+    }
+
+    /**
+     * @param value {@link #activePeriod} (Indicates the period of time over which the account is allowed.)
+     */
+    public Account setActivePeriod(Period value) { 
+      this.activePeriod = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #currency} (Identifies the currency to which transactions must be converted when crediting or debiting the account.)
+     */
+    public Coding getCurrency() { 
+      if (this.currency == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.currency");
+        else if (Configuration.doAutoCreate())
+          this.currency = new Coding(); // cc
+      return this.currency;
+    }
+
+    public boolean hasCurrency() { 
+      return this.currency != null && !this.currency.isEmpty();
+    }
+
+    /**
+     * @param value {@link #currency} (Identifies the currency to which transactions must be converted when crediting or debiting the account.)
+     */
+    public Account setCurrency(Coding value) { 
+      this.currency = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #balance} (Represents the sum of all credits less all debits associated with the account.  Might be positive, zero or negative.)
+     */
+    public Money getBalance() { 
+      if (this.balance == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.balance");
+        else if (Configuration.doAutoCreate())
+          this.balance = new Money(); // cc
+      return this.balance;
+    }
+
+    public boolean hasBalance() { 
+      return this.balance != null && !this.balance.isEmpty();
+    }
+
+    /**
+     * @param value {@link #balance} (Represents the sum of all credits less all debits associated with the account.  Might be positive, zero or negative.)
+     */
+    public Account setBalance(Money value) { 
+      this.balance = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #coveragePeriod} (Identifies the period of time the account applies to.  E.g. accounts created per fiscal year, quarter, etc.)
+     */
+    public Period getCoveragePeriod() { 
+      if (this.coveragePeriod == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.coveragePeriod");
+        else if (Configuration.doAutoCreate())
+          this.coveragePeriod = new Period(); // cc
+      return this.coveragePeriod;
+    }
+
+    public boolean hasCoveragePeriod() { 
+      return this.coveragePeriod != null && !this.coveragePeriod.isEmpty();
+    }
+
+    /**
+     * @param value {@link #coveragePeriod} (Identifies the period of time the account applies to.  E.g. accounts created per fiscal year, quarter, etc.)
+     */
+    public Account setCoveragePeriod(Period value) { 
+      this.coveragePeriod = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #subject} (Identifies the patient, device, practitioner, location or other object the account is associated with.)
+     */
+    public Reference getSubject() { 
+      if (this.subject == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.subject");
+        else if (Configuration.doAutoCreate())
+          this.subject = new Reference(); // cc
+      return this.subject;
+    }
+
+    public boolean hasSubject() { 
+      return this.subject != null && !this.subject.isEmpty();
+    }
+
+    /**
+     * @param value {@link #subject} (Identifies the patient, device, practitioner, location or other object the account is associated with.)
+     */
+    public Account setSubject(Reference value) { 
+      this.subject = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #subject} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Identifies the patient, device, practitioner, location or other object the account is associated with.)
+     */
+    public Resource getSubjectTarget() { 
+      return this.subjectTarget;
+    }
+
+    /**
+     * @param value {@link #subject} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Identifies the patient, device, practitioner, location or other object the account is associated with.)
+     */
+    public Account setSubjectTarget(Resource value) { 
+      this.subjectTarget = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #owner} (Indicates the organization, department, etc. with responsibility for the account.)
+     */
+    public Reference getOwner() { 
+      if (this.owner == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.owner");
+        else if (Configuration.doAutoCreate())
+          this.owner = new Reference(); // cc
+      return this.owner;
+    }
+
+    public boolean hasOwner() { 
+      return this.owner != null && !this.owner.isEmpty();
+    }
+
+    /**
+     * @param value {@link #owner} (Indicates the organization, department, etc. with responsibility for the account.)
+     */
+    public Account setOwner(Reference value) { 
+      this.owner = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #owner} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Indicates the organization, department, etc. with responsibility for the account.)
+     */
+    public Organization getOwnerTarget() { 
+      if (this.ownerTarget == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.owner");
+        else if (Configuration.doAutoCreate())
+          this.ownerTarget = new Organization(); // aa
+      return this.ownerTarget;
+    }
+
+    /**
+     * @param value {@link #owner} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Indicates the organization, department, etc. with responsibility for the account.)
+     */
+    public Account setOwnerTarget(Organization value) { 
+      this.ownerTarget = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #description} (Provides additional information about what the account tracks and how it is used.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
+     */
+    public StringType getDescriptionElement() { 
+      if (this.description == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Account.description");
+        else if (Configuration.doAutoCreate())
+          this.description = new StringType(); // bb
+      return this.description;
+    }
+
+    public boolean hasDescriptionElement() { 
+      return this.description != null && !this.description.isEmpty();
+    }
+
+    public boolean hasDescription() { 
+      return this.description != null && !this.description.isEmpty();
+    }
+
+    /**
+     * @param value {@link #description} (Provides additional information about what the account tracks and how it is used.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
+     */
+    public Account setDescriptionElement(StringType value) { 
+      this.description = value;
+      return this;
+    }
+
+    /**
+     * @return Provides additional information about what the account tracks and how it is used.
+     */
+    public String getDescription() { 
+      return this.description == null ? null : this.description.getValue();
+    }
+
+    /**
+     * @param value Provides additional information about what the account tracks and how it is used.
+     */
+    public Account setDescription(String value) { 
+      if (Utilities.noString(value))
+        this.description = null;
+      else {
+        if (this.description == null)
+          this.description = new StringType();
+        this.description.setValue(value);
+      }
+      return this;
+    }
+
+      protected void listChildren(List<Property> childrenList) {
+        super.listChildren(childrenList);
+        childrenList.add(new Property("identifier", "Identifier", "Unique identifier used to reference the account.  May or may not be intended for human use.  (E.g. credit card number).", 0, java.lang.Integer.MAX_VALUE, identifier));
+        childrenList.add(new Property("name", "string", "Name used for the account when displaying it to humans in reports, etc.", 0, java.lang.Integer.MAX_VALUE, name));
+        childrenList.add(new Property("type", "CodeableConcept", "Categorizes the account for reporting and searching purposes.", 0, java.lang.Integer.MAX_VALUE, type));
+        childrenList.add(new Property("status", "code", "Indicates whether the account is presently used/useable or not.", 0, java.lang.Integer.MAX_VALUE, status));
+        childrenList.add(new Property("activePeriod", "Period", "Indicates the period of time over which the account is allowed.", 0, java.lang.Integer.MAX_VALUE, activePeriod));
+        childrenList.add(new Property("currency", "Coding", "Identifies the currency to which transactions must be converted when crediting or debiting the account.", 0, java.lang.Integer.MAX_VALUE, currency));
+        childrenList.add(new Property("balance", "Money", "Represents the sum of all credits less all debits associated with the account.  Might be positive, zero or negative.", 0, java.lang.Integer.MAX_VALUE, balance));
+        childrenList.add(new Property("coveragePeriod", "Period", "Identifies the period of time the account applies to.  E.g. accounts created per fiscal year, quarter, etc.", 0, java.lang.Integer.MAX_VALUE, coveragePeriod));
+        childrenList.add(new Property("subject", "Reference(Patient|Device|Practitioner|Location|HealthcareService|Organization)", "Identifies the patient, device, practitioner, location or other object the account is associated with.", 0, java.lang.Integer.MAX_VALUE, subject));
+        childrenList.add(new Property("owner", "Reference(Organization)", "Indicates the organization, department, etc. with responsibility for the account.", 0, java.lang.Integer.MAX_VALUE, owner));
+        childrenList.add(new Property("description", "string", "Provides additional information about what the account tracks and how it is used.", 0, java.lang.Integer.MAX_VALUE, description));
+      }
+
+      public Account copy() {
+        Account dst = new Account();
+        copyValues(dst);
+        if (identifier != null) {
+          dst.identifier = new ArrayList<Identifier>();
+          for (Identifier i : identifier)
+            dst.identifier.add(i.copy());
+        };
+        dst.name = name == null ? null : name.copy();
+        dst.type = type == null ? null : type.copy();
+        dst.status = status == null ? null : status.copy();
+        dst.activePeriod = activePeriod == null ? null : activePeriod.copy();
+        dst.currency = currency == null ? null : currency.copy();
+        dst.balance = balance == null ? null : balance.copy();
+        dst.coveragePeriod = coveragePeriod == null ? null : coveragePeriod.copy();
+        dst.subject = subject == null ? null : subject.copy();
+        dst.owner = owner == null ? null : owner.copy();
+        dst.description = description == null ? null : description.copy();
+        return dst;
+      }
+
+      protected Account typedCopy() {
+        return copy();
+      }
+
+      @Override
+      public boolean equalsDeep(Base other) {
+        if (!super.equalsDeep(other))
+          return false;
+        if (!(other instanceof Account))
+          return false;
+        Account o = (Account) other;
+        return compareDeep(identifier, o.identifier, true) && compareDeep(name, o.name, true) && compareDeep(type, o.type, true)
+           && compareDeep(status, o.status, true) && compareDeep(activePeriod, o.activePeriod, true) && compareDeep(currency, o.currency, true)
+           && compareDeep(balance, o.balance, true) && compareDeep(coveragePeriod, o.coveragePeriod, true)
+           && compareDeep(subject, o.subject, true) && compareDeep(owner, o.owner, true) && compareDeep(description, o.description, true)
+          ;
+      }
+
+      @Override
+      public boolean equalsShallow(Base other) {
+        if (!super.equalsShallow(other))
+          return false;
+        if (!(other instanceof Account))
+          return false;
+        Account o = (Account) other;
+        return compareValues(name, o.name, true) && compareValues(status, o.status, true) && compareValues(description, o.description, true)
+          ;
+      }
+
+      public boolean isEmpty() {
+        return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (name == null || name.isEmpty())
+           && (type == null || type.isEmpty()) && (status == null || status.isEmpty()) && (activePeriod == null || activePeriod.isEmpty())
+           && (currency == null || currency.isEmpty()) && (balance == null || balance.isEmpty()) && (coveragePeriod == null || coveragePeriod.isEmpty())
+           && (subject == null || subject.isEmpty()) && (owner == null || owner.isEmpty()) && (description == null || description.isEmpty())
+          ;
+      }
+
+  @Override
+  public ResourceType getResourceType() {
+    return ResourceType.Account;
+   }
+
+  @SearchParamDefinition(name="owner", path="Account.owner", description="Who is responsible?", type="reference" )
+  public static final String SP_OWNER = "owner";
+  @SearchParamDefinition(name="identifier", path="Account.identifier", description="Account number", type="token" )
+  public static final String SP_IDENTIFIER = "identifier";
+  @SearchParamDefinition(name="period", path="Account.coveragePeriod", description="Transaction window", type="date" )
+  public static final String SP_PERIOD = "period";
+  @SearchParamDefinition(name="balance", path="Account.balance", description="How much is in account?", type="number" )
+  public static final String SP_BALANCE = "balance";
+  @SearchParamDefinition(name="subject", path="Account.subject", description="What is account tied to?", type="reference" )
+  public static final String SP_SUBJECT = "subject";
+  @SearchParamDefinition(name="patient", path="Account.subject", description="What is account tied to?", type="reference" )
+  public static final String SP_PATIENT = "patient";
+  @SearchParamDefinition(name="name", path="Account.name", description="Human-readable label", type="string" )
+  public static final String SP_NAME = "name";
+  @SearchParamDefinition(name="type", path="Account.type", description="E.g. patient, expense, depreciation", type="token" )
+  public static final String SP_TYPE = "type";
+  @SearchParamDefinition(name="status", path="Account.status", description="active | inactive", type="token" )
+  public static final String SP_STATUS = "status";
+
+}
+

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -90,10 +90,10 @@ public class Address extends Type implements ICompositeType {
         }
         public String getSystem() {
           switch (this) {
-            case HOME: return "http://hl7.org.fhir/address-use";
-            case WORK: return "http://hl7.org.fhir/address-use";
-            case TEMP: return "http://hl7.org.fhir/address-use";
-            case OLD: return "http://hl7.org.fhir/address-use";
+            case HOME: return "http://hl7.org/fhir/address-use";
+            case WORK: return "http://hl7.org/fhir/address-use";
+            case TEMP: return "http://hl7.org/fhir/address-use";
+            case OLD: return "http://hl7.org/fhir/address-use";
             default: return "?";
           }
         }
@@ -110,8 +110,8 @@ public class Address extends Type implements ICompositeType {
           switch (this) {
             case HOME: return "Home";
             case WORK: return "Work";
-            case TEMP: return "Temp";
-            case OLD: return "Old";
+            case TEMP: return "Temporary";
+            case OLD: return "Old / Incorrect";
             default: return "?";
           }
         }
@@ -145,6 +145,92 @@ public class Address extends Type implements ICompositeType {
       }
     }
 
+    public enum AddressType {
+        /**
+         * Mailing addresses - PO Boxes and care-of addresses
+         */
+        POSTAL, 
+        /**
+         * A physical address that can be visited
+         */
+        PHYSICAL, 
+        /**
+         * An address that is both physical and postal
+         */
+        BOTH, 
+        /**
+         * added to help the parsers
+         */
+        NULL;
+        public static AddressType fromCode(String codeString) throws Exception {
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("postal".equals(codeString))
+          return POSTAL;
+        if ("physical".equals(codeString))
+          return PHYSICAL;
+        if ("both".equals(codeString))
+          return BOTH;
+        throw new Exception("Unknown AddressType code '"+codeString+"'");
+        }
+        public String toCode() {
+          switch (this) {
+            case POSTAL: return "postal";
+            case PHYSICAL: return "physical";
+            case BOTH: return "both";
+            default: return "?";
+          }
+        }
+        public String getSystem() {
+          switch (this) {
+            case POSTAL: return "http://hl7.org/fhir/address-type";
+            case PHYSICAL: return "http://hl7.org/fhir/address-type";
+            case BOTH: return "http://hl7.org/fhir/address-type";
+            default: return "?";
+          }
+        }
+        public String getDefinition() {
+          switch (this) {
+            case POSTAL: return "Mailing addresses - PO Boxes and care-of addresses";
+            case PHYSICAL: return "A physical address that can be visited";
+            case BOTH: return "An address that is both physical and postal";
+            default: return "?";
+          }
+        }
+        public String getDisplay() {
+          switch (this) {
+            case POSTAL: return "Postal";
+            case PHYSICAL: return "Physical";
+            case BOTH: return "Postal & Physical";
+            default: return "?";
+          }
+        }
+    }
+
+  public static class AddressTypeEnumFactory implements EnumFactory<AddressType> {
+    public AddressType fromCode(String codeString) throws IllegalArgumentException {
+      if (codeString == null || "".equals(codeString))
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("postal".equals(codeString))
+          return AddressType.POSTAL;
+        if ("physical".equals(codeString))
+          return AddressType.PHYSICAL;
+        if ("both".equals(codeString))
+          return AddressType.BOTH;
+        throw new IllegalArgumentException("Unknown AddressType code '"+codeString+"'");
+        }
+    public String toCode(AddressType code) {
+      if (code == AddressType.POSTAL)
+        return "postal";
+      if (code == AddressType.PHYSICAL)
+        return "physical";
+      if (code == AddressType.BOTH)
+        return "both";
+      return "?";
+      }
+    }
+
     /**
      * The purpose of this address.
      */
@@ -152,10 +238,17 @@ public class Address extends Type implements ICompositeType {
     @Description(shortDefinition="home | work | temp | old - purpose of this address", formalDefinition="The purpose of this address." )
     protected Enumeration<AddressUse> use;
 
+    /**
+     * Distinguishes between physical addresses (those you can visit) and mailing addresses (e.g. PO Boxes and care-of addresses). Most addresses are both.
+     */
+    @Child(name = "type", type = {CodeType.class}, order=1, min=0, max=1)
+    @Description(shortDefinition="postal | physical | both", formalDefinition="Distinguishes between physical addresses (those you can visit) and mailing addresses (e.g. PO Boxes and care-of addresses). Most addresses are both." )
+    protected Enumeration<AddressType> type;
+
     /**
      * A full text representation of the address.
      */
-    @Child(name = "text", type = {StringType.class}, order=1, min=0, max=1)
+    @Child(name = "text", type = {StringType.class}, order=2, min=0, max=1)
     @Description(shortDefinition="Text representation of the address", formalDefinition="A full text representation of the address." )
     protected StringType text;
 
@@ -163,46 +256,46 @@ public class Address extends Type implements ICompositeType {
      * This component contains the house number, apartment number, street name, street direction, 
 P.O. Box number, delivery hints, and similar address information.
      */
-    @Child(name = "line", type = {StringType.class}, order=2, min=0, max=Child.MAX_UNLIMITED)
+    @Child(name = "line", type = {StringType.class}, order=3, min=0, max=Child.MAX_UNLIMITED)
     @Description(shortDefinition="Street name, number, direction & P.O. Box etc", formalDefinition="This component contains the house number, apartment number, street name, street direction, \nP.O. Box number, delivery hints, and similar address information." )
     protected List<StringType> line;
 
     /**
      * The name of the city, town, village or other community or delivery center.
      */
-    @Child(name = "city", type = {StringType.class}, order=3, min=0, max=1)
+    @Child(name = "city", type = {StringType.class}, order=4, min=0, max=1)
     @Description(shortDefinition="Name of city, town etc.", formalDefinition="The name of the city, town, village or other community or delivery center." )
     protected StringType city;
 
     /**
      * Sub-unit of a country with limited sovereignty in a federally organized country. A code may be used if codes are in common use (i.e. US 2 letter state codes).
      */
-    @Child(name = "state", type = {StringType.class}, order=4, min=0, max=1)
+    @Child(name = "state", type = {StringType.class}, order=5, min=0, max=1)
     @Description(shortDefinition="Sub-unit of country (abreviations ok)", formalDefinition="Sub-unit of a country with limited sovereignty in a federally organized country. A code may be used if codes are in common use (i.e. US 2 letter state codes)." )
     protected StringType state;
 
     /**
      * A postal code designating a region defined by the postal service.
      */
-    @Child(name = "postalCode", type = {StringType.class}, order=5, min=0, max=1)
+    @Child(name = "postalCode", type = {StringType.class}, order=6, min=0, max=1)
     @Description(shortDefinition="Postal code for area", formalDefinition="A postal code designating a region defined by the postal service." )
     protected StringType postalCode;
 
     /**
      * Country - a nation as commonly understood or generally accepted.
      */
-    @Child(name = "country", type = {StringType.class}, order=6, min=0, max=1)
+    @Child(name = "country", type = {StringType.class}, order=7, min=0, max=1)
     @Description(shortDefinition="Country (can be ISO 3166 3 letter code)", formalDefinition="Country - a nation as commonly understood or generally accepted." )
     protected StringType country;
 
     /**
      * Time period when address was/is in use.
      */
-    @Child(name = "period", type = {Period.class}, order=7, min=0, max=1)
+    @Child(name = "period", type = {Period.class}, order=8, min=0, max=1)
     @Description(shortDefinition="Time period when address was/is in use", formalDefinition="Time period when address was/is in use." )
     protected Period period;
 
-    private static final long serialVersionUID = -470351694L;
+    private static final long serialVersionUID = 1890613287L;
 
   /*
    * Constructor
@@ -260,6 +353,55 @@ P.O. Box number, delivery hints, and similar address information.
       return this;
     }
 
+    /**
+     * @return {@link #type} (Distinguishes between physical addresses (those you can visit) and mailing addresses (e.g. PO Boxes and care-of addresses). Most addresses are both.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+     */
+    public Enumeration<AddressType> getTypeElement() { 
+      if (this.type == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Address.type");
+        else if (Configuration.doAutoCreate())
+          this.type = new Enumeration<AddressType>(new AddressTypeEnumFactory()); // bb
+      return this.type;
+    }
+
+    public boolean hasTypeElement() { 
+      return this.type != null && !this.type.isEmpty();
+    }
+
+    public boolean hasType() { 
+      return this.type != null && !this.type.isEmpty();
+    }
+
+    /**
+     * @param value {@link #type} (Distinguishes between physical addresses (those you can visit) and mailing addresses (e.g. PO Boxes and care-of addresses). Most addresses are both.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+     */
+    public Address setTypeElement(Enumeration<AddressType> value) { 
+      this.type = value;
+      return this;
+    }
+
+    /**
+     * @return Distinguishes between physical addresses (those you can visit) and mailing addresses (e.g. PO Boxes and care-of addresses). Most addresses are both.
+     */
+    public AddressType getType() { 
+      return this.type == null ? null : this.type.getValue();
+    }
+
+    /**
+     * @param value Distinguishes between physical addresses (those you can visit) and mailing addresses (e.g. PO Boxes and care-of addresses). Most addresses are both.
+     */
+    public Address setType(AddressType value) { 
+      if (value == null)
+        this.type = null;
+      else {
+        if (this.type == null)
+          this.type = new Enumeration<AddressType>(new AddressTypeEnumFactory());
+        this.type.setValue(value);
+      }
+      return this;
+    }
+
     /**
      * @return {@link #text} (A full text representation of the address.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value
      */
@@ -590,6 +732,7 @@ P.O. Box number, delivery hints, and similar address information.)
       protected void listChildren(List<Property> childrenList) {
         super.listChildren(childrenList);
         childrenList.add(new Property("use", "code", "The purpose of this address.", 0, java.lang.Integer.MAX_VALUE, use));
+        childrenList.add(new Property("type", "code", "Distinguishes between physical addresses (those you can visit) and mailing addresses (e.g. PO Boxes and care-of addresses). Most addresses are both.", 0, java.lang.Integer.MAX_VALUE, type));
         childrenList.add(new Property("text", "string", "A full text representation of the address.", 0, java.lang.Integer.MAX_VALUE, text));
         childrenList.add(new Property("line", "string", "This component contains the house number, apartment number, street name, street direction, \nP.O. Box number, delivery hints, and similar address information.", 0, java.lang.Integer.MAX_VALUE, line));
         childrenList.add(new Property("city", "string", "The name of the city, town, village or other community or delivery center.", 0, java.lang.Integer.MAX_VALUE, city));
@@ -603,6 +746,7 @@ P.O. Box number, delivery hints, and similar address information.)
         Address dst = new Address();
         copyValues(dst);
         dst.use = use == null ? null : use.copy();
+        dst.type = type == null ? null : type.copy();
         dst.text = text == null ? null : text.copy();
         if (line != null) {
           dst.line = new ArrayList<StringType>();
@@ -628,9 +772,10 @@ P.O. Box number, delivery hints, and similar address information.)
         if (!(other instanceof Address))
           return false;
         Address o = (Address) other;
-        return compareDeep(use, o.use, true) && compareDeep(text, o.text, true) && compareDeep(line, o.line, true)
-           && compareDeep(city, o.city, true) && compareDeep(state, o.state, true) && compareDeep(postalCode, o.postalCode, true)
-           && compareDeep(country, o.country, true) && compareDeep(period, o.period, true);
+        return compareDeep(use, o.use, true) && compareDeep(type, o.type, true) && compareDeep(text, o.text, true)
+           && compareDeep(line, o.line, true) && compareDeep(city, o.city, true) && compareDeep(state, o.state, true)
+           && compareDeep(postalCode, o.postalCode, true) && compareDeep(country, o.country, true) && compareDeep(period, o.period, true)
+          ;
       }
 
       @Override
@@ -640,15 +785,15 @@ P.O. Box number, delivery hints, and similar address information.)
         if (!(other instanceof Address))
           return false;
         Address o = (Address) other;
-        return compareValues(use, o.use, true) && compareValues(text, o.text, true) && compareValues(line, o.line, true)
-           && compareValues(city, o.city, true) && compareValues(state, o.state, true) && compareValues(postalCode, o.postalCode, true)
-           && compareValues(country, o.country, true);
+        return compareValues(use, o.use, true) && compareValues(type, o.type, true) && compareValues(text, o.text, true)
+           && compareValues(line, o.line, true) && compareValues(city, o.city, true) && compareValues(state, o.state, true)
+           && compareValues(postalCode, o.postalCode, true) && compareValues(country, o.country, true);
       }
 
       public boolean isEmpty() {
-        return super.isEmpty() && (use == null || use.isEmpty()) && (text == null || text.isEmpty())
-           && (line == null || line.isEmpty()) && (city == null || city.isEmpty()) && (state == null || state.isEmpty())
-           && (postalCode == null || postalCode.isEmpty()) && (country == null || country.isEmpty())
+        return super.isEmpty() && (use == null || use.isEmpty()) && (type == null || type.isEmpty())
+           && (text == null || text.isEmpty()) && (line == null || line.isEmpty()) && (city == null || city.isEmpty())
+           && (state == null || state.isEmpty()) && (postalCode == null || postalCode.isEmpty()) && (country == null || country.isEmpty())
            && (period == null || period.isEmpty());
       }
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import org.hl7.fhir.instance.model.annotations.DatatypeDef;
 import org.hl7.fhir.instance.model.annotations.Block;

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -98,11 +98,11 @@ public class AllergyIntolerance extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case UNCONFIRMED: return "http://hl7.org.fhir/allergy-intolerance-status";
-            case CONFIRMED: return "http://hl7.org.fhir/allergy-intolerance-status";
-            case RESOLVED: return "http://hl7.org.fhir/allergy-intolerance-status";
-            case REFUTED: return "http://hl7.org.fhir/allergy-intolerance-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/allergy-intolerance-status";
+            case UNCONFIRMED: return "http://hl7.org/fhir/allergy-intolerance-status";
+            case CONFIRMED: return "http://hl7.org/fhir/allergy-intolerance-status";
+            case RESOLVED: return "http://hl7.org/fhir/allergy-intolerance-status";
+            case REFUTED: return "http://hl7.org/fhir/allergy-intolerance-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/allergy-intolerance-status";
             default: return "?";
           }
         }
@@ -198,9 +198,9 @@ public class AllergyIntolerance extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case LOW: return "http://hl7.org.fhir/allergy-intolerance-criticality";
-            case HIGH: return "http://hl7.org.fhir/allergy-intolerance-criticality";
-            case UNASSESSIBLE: return "http://hl7.org.fhir/allergy-intolerance-criticality";
+            case LOW: return "http://hl7.org/fhir/allergy-intolerance-criticality";
+            case HIGH: return "http://hl7.org/fhir/allergy-intolerance-criticality";
+            case UNASSESSIBLE: return "http://hl7.org/fhir/allergy-intolerance-criticality";
             default: return "?";
           }
         }
@@ -277,8 +277,8 @@ public class AllergyIntolerance extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case IMMUNE: return "http://hl7.org.fhir/allergy-intolerance-type";
-            case NONIMMUNE: return "http://hl7.org.fhir/allergy-intolerance-type";
+            case IMMUNE: return "http://hl7.org/fhir/allergy-intolerance-type";
+            case NONIMMUNE: return "http://hl7.org/fhir/allergy-intolerance-type";
             default: return "?";
           }
         }
@@ -356,9 +356,9 @@ public class AllergyIntolerance extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case FOOD: return "http://hl7.org.fhir/allergy-intolerance-category";
-            case MEDICATION: return "http://hl7.org.fhir/allergy-intolerance-category";
-            case ENVIRONMENT: return "http://hl7.org.fhir/allergy-intolerance-category";
+            case FOOD: return "http://hl7.org/fhir/allergy-intolerance-category";
+            case MEDICATION: return "http://hl7.org/fhir/allergy-intolerance-category";
+            case ENVIRONMENT: return "http://hl7.org/fhir/allergy-intolerance-category";
             default: return "?";
           }
         }
@@ -442,9 +442,9 @@ public class AllergyIntolerance extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case UNLIKELY: return "http://hl7.org.fhir/reaction-event-certainty";
-            case LIKELY: return "http://hl7.org.fhir/reaction-event-certainty";
-            case CONFIRMED: return "http://hl7.org.fhir/reaction-event-certainty";
+            case UNLIKELY: return "http://hl7.org/fhir/reaction-event-certainty";
+            case LIKELY: return "http://hl7.org/fhir/reaction-event-certainty";
+            case CONFIRMED: return "http://hl7.org/fhir/reaction-event-certainty";
             default: return "?";
           }
         }
@@ -528,9 +528,9 @@ public class AllergyIntolerance extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case MILD: return "http://hl7.org.fhir/reaction-event-severity";
-            case MODERATE: return "http://hl7.org.fhir/reaction-event-severity";
-            case SEVERE: return "http://hl7.org.fhir/reaction-event-severity";
+            case MILD: return "http://hl7.org/fhir/reaction-event-severity";
+            case MODERATE: return "http://hl7.org/fhir/reaction-event-severity";
+            case SEVERE: return "http://hl7.org/fhir/reaction-event-severity";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java

@@ -0,0 +1,273 @@
+package org.hl7.fhir.instance.model;
+
+/*
+  Copyright (c) 2011+, HL7, Inc.
+  All rights reserved.
+  
+  Redistribution and use in source and binary forms, with or without modification, 
+  are permitted provided that the following conditions are met:
+  
+   * Redistributions of source code must retain the above copyright notice, this 
+     list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright notice, 
+     this list of conditions and the following disclaimer in the documentation 
+     and/or other materials provided with the distribution.
+   * Neither the name of HL7 nor the names of its contributors may be used to 
+     endorse or promote products derived from this software without specific 
+     prior written permission.
+  
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+  POSSIBILITY OF SUCH DAMAGE.
+  
+*/
+
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+
+import java.util.*;
+
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.instance.model.annotations.Child;
+import org.hl7.fhir.instance.model.annotations.Description;
+import org.hl7.fhir.instance.model.annotations.DatatypeDef;
+import org.hl7.fhir.instance.model.annotations.Block;
+import org.hl7.fhir.instance.model.api.*;
+/**
+ * A  text note which also  contains information about who made the statement and when.
+ */
+@DatatypeDef(name="Annotation")
+public class Annotation extends Type implements ICompositeType {
+
+    /**
+     * The individual responsible for making the annotation.
+     */
+    @Child(name = "author", type = {Practitioner.class, Patient.class, RelatedPerson.class, StringType.class}, order=0, min=0, max=1)
+    @Description(shortDefinition="Individual responsible for the annotation", formalDefinition="The individual responsible for making the annotation." )
+    protected Type author;
+
+    /**
+     * Indicates when this particular annotation was made.
+     */
+    @Child(name = "time", type = {DateTimeType.class}, order=1, min=0, max=1)
+    @Description(shortDefinition="When the annotation was made", formalDefinition="Indicates when this particular annotation was made." )
+    protected DateTimeType time;
+
+    /**
+     * The text of the annotation.
+     */
+    @Child(name = "text", type = {StringType.class}, order=2, min=1, max=1)
+    @Description(shortDefinition="The annotation  - text content", formalDefinition="The text of the annotation." )
+    protected StringType text;
+
+    private static final long serialVersionUID = -575590381L;
+
+  /*
+   * Constructor
+   */
+    public Annotation() {
+      super();
+    }
+
+  /*
+   * Constructor
+   */
+    public Annotation(StringType text) {
+      super();
+      this.text = text;
+    }
+
+    /**
+     * @return {@link #author} (The individual responsible for making the annotation.)
+     */
+    public Type getAuthor() { 
+      return this.author;
+    }
+
+    /**
+     * @return {@link #author} (The individual responsible for making the annotation.)
+     */
+    public Reference getAuthorReference() throws Exception { 
+      if (!(this.author instanceof Reference))
+        throw new Exception("Type mismatch: the type Reference was expected, but "+this.author.getClass().getName()+" was encountered");
+      return (Reference) this.author;
+    }
+
+    public boolean hasAuthorReference() throws Exception { 
+      return this.author instanceof Reference;
+    }
+
+    /**
+     * @return {@link #author} (The individual responsible for making the annotation.)
+     */
+    public StringType getAuthorStringType() throws Exception { 
+      if (!(this.author instanceof StringType))
+        throw new Exception("Type mismatch: the type StringType was expected, but "+this.author.getClass().getName()+" was encountered");
+      return (StringType) this.author;
+    }
+
+    public boolean hasAuthorStringType() throws Exception { 
+      return this.author instanceof StringType;
+    }
+
+    public boolean hasAuthor() { 
+      return this.author != null && !this.author.isEmpty();
+    }
+
+    /**
+     * @param value {@link #author} (The individual responsible for making the annotation.)
+     */
+    public Annotation setAuthor(Type value) { 
+      this.author = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #time} (Indicates when this particular annotation was made.). This is the underlying object with id, value and extensions. The accessor "getTime" gives direct access to the value
+     */
+    public DateTimeType getTimeElement() { 
+      if (this.time == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Annotation.time");
+        else if (Configuration.doAutoCreate())
+          this.time = new DateTimeType(); // bb
+      return this.time;
+    }
+
+    public boolean hasTimeElement() { 
+      return this.time != null && !this.time.isEmpty();
+    }
+
+    public boolean hasTime() { 
+      return this.time != null && !this.time.isEmpty();
+    }
+
+    /**
+     * @param value {@link #time} (Indicates when this particular annotation was made.). This is the underlying object with id, value and extensions. The accessor "getTime" gives direct access to the value
+     */
+    public Annotation setTimeElement(DateTimeType value) { 
+      this.time = value;
+      return this;
+    }
+
+    /**
+     * @return Indicates when this particular annotation was made.
+     */
+    public Date getTime() { 
+      return this.time == null ? null : this.time.getValue();
+    }
+
+    /**
+     * @param value Indicates when this particular annotation was made.
+     */
+    public Annotation setTime(Date value) { 
+      if (value == null)
+        this.time = null;
+      else {
+        if (this.time == null)
+          this.time = new DateTimeType();
+        this.time.setValue(value);
+      }
+      return this;
+    }
+
+    /**
+     * @return {@link #text} (The text of the annotation.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value
+     */
+    public StringType getTextElement() { 
+      if (this.text == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create Annotation.text");
+        else if (Configuration.doAutoCreate())
+          this.text = new StringType(); // bb
+      return this.text;
+    }
+
+    public boolean hasTextElement() { 
+      return this.text != null && !this.text.isEmpty();
+    }
+
+    public boolean hasText() { 
+      return this.text != null && !this.text.isEmpty();
+    }
+
+    /**
+     * @param value {@link #text} (The text of the annotation.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value
+     */
+    public Annotation setTextElement(StringType value) { 
+      this.text = value;
+      return this;
+    }
+
+    /**
+     * @return The text of the annotation.
+     */
+    public String getText() { 
+      return this.text == null ? null : this.text.getValue();
+    }
+
+    /**
+     * @param value The text of the annotation.
+     */
+    public Annotation setText(String value) { 
+        if (this.text == null)
+          this.text = new StringType();
+        this.text.setValue(value);
+      return this;
+    }
+
+      protected void listChildren(List<Property> childrenList) {
+        super.listChildren(childrenList);
+        childrenList.add(new Property("author[x]", "Reference(Practitioner|Patient|RelatedPerson)|string", "The individual responsible for making the annotation.", 0, java.lang.Integer.MAX_VALUE, author));
+        childrenList.add(new Property("time", "dateTime", "Indicates when this particular annotation was made.", 0, java.lang.Integer.MAX_VALUE, time));
+        childrenList.add(new Property("text", "string", "The text of the annotation.", 0, java.lang.Integer.MAX_VALUE, text));
+      }
+
+      public Annotation copy() {
+        Annotation dst = new Annotation();
+        copyValues(dst);
+        dst.author = author == null ? null : author.copy();
+        dst.time = time == null ? null : time.copy();
+        dst.text = text == null ? null : text.copy();
+        return dst;
+      }
+
+      protected Annotation typedCopy() {
+        return copy();
+      }
+
+      @Override
+      public boolean equalsDeep(Base other) {
+        if (!super.equalsDeep(other))
+          return false;
+        if (!(other instanceof Annotation))
+          return false;
+        Annotation o = (Annotation) other;
+        return compareDeep(author, o.author, true) && compareDeep(time, o.time, true) && compareDeep(text, o.text, true)
+          ;
+      }
+
+      @Override
+      public boolean equalsShallow(Base other) {
+        if (!super.equalsShallow(other))
+          return false;
+        if (!(other instanceof Annotation))
+          return false;
+        Annotation o = (Annotation) other;
+        return compareValues(time, o.time, true) && compareValues(text, o.text, true);
+      }
+
+      public boolean isEmpty() {
+        return super.isEmpty() && (author == null || author.isEmpty()) && (time == null || time.isEmpty())
+           && (text == null || text.isEmpty());
+      }
+
+
+}
+

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -105,12 +105,12 @@ public class Appointment extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PENDING: return "http://hl7.org.fhir/appointmentstatus";
-            case BOOKED: return "http://hl7.org.fhir/appointmentstatus";
-            case ARRIVED: return "http://hl7.org.fhir/appointmentstatus";
-            case FULFILLED: return "http://hl7.org.fhir/appointmentstatus";
-            case CANCELLED: return "http://hl7.org.fhir/appointmentstatus";
-            case NOSHOW: return "http://hl7.org.fhir/appointmentstatus";
+            case PENDING: return "http://hl7.org/fhir/appointmentstatus";
+            case BOOKED: return "http://hl7.org/fhir/appointmentstatus";
+            case ARRIVED: return "http://hl7.org/fhir/appointmentstatus";
+            case FULFILLED: return "http://hl7.org/fhir/appointmentstatus";
+            case CANCELLED: return "http://hl7.org/fhir/appointmentstatus";
+            case NOSHOW: return "http://hl7.org/fhir/appointmentstatus";
             default: return "?";
           }
         }
@@ -212,9 +212,9 @@ public class Appointment extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case REQUIRED: return "http://hl7.org.fhir/participantrequired";
-            case OPTIONAL: return "http://hl7.org.fhir/participantrequired";
-            case INFORMATIONONLY: return "http://hl7.org.fhir/participantrequired";
+            case REQUIRED: return "http://hl7.org/fhir/participantrequired";
+            case OPTIONAL: return "http://hl7.org/fhir/participantrequired";
+            case INFORMATIONONLY: return "http://hl7.org/fhir/participantrequired";
             default: return "?";
           }
         }
@@ -305,10 +305,10 @@ public class Appointment extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case ACCEPTED: return "http://hl7.org.fhir/participationstatus";
-            case DECLINED: return "http://hl7.org.fhir/participationstatus";
-            case TENTATIVE: return "http://hl7.org.fhir/participationstatus";
-            case NEEDSACTION: return "http://hl7.org.fhir/participationstatus";
+            case ACCEPTED: return "http://hl7.org/fhir/participationstatus";
+            case DECLINED: return "http://hl7.org/fhir/participationstatus";
+            case TENTATIVE: return "http://hl7.org/fhir/participationstatus";
+            case NEEDSACTION: return "http://hl7.org/fhir/participationstatus";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -105,12 +105,12 @@ public class AppointmentResponse extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case ACCEPTED: return "http://hl7.org.fhir/participantstatus";
-            case DECLINED: return "http://hl7.org.fhir/participantstatus";
-            case TENTATIVE: return "http://hl7.org.fhir/participantstatus";
-            case INPROCESS: return "http://hl7.org.fhir/participantstatus";
-            case COMPLETED: return "http://hl7.org.fhir/participantstatus";
-            case NEEDSACTION: return "http://hl7.org.fhir/participantstatus";
+            case ACCEPTED: return "http://hl7.org/fhir/participantstatus";
+            case DECLINED: return "http://hl7.org/fhir/participantstatus";
+            case TENTATIVE: return "http://hl7.org/fhir/participantstatus";
+            case INPROCESS: return "http://hl7.org/fhir/participantstatus";
+            case COMPLETED: return "http://hl7.org/fhir/participantstatus";
+            case NEEDSACTION: return "http://hl7.org/fhir/participantstatus";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -98,11 +98,11 @@ public class AuditEvent extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case C: return "http://hl7.org.fhir/audit-event-action";
-            case R: return "http://hl7.org.fhir/audit-event-action";
-            case U: return "http://hl7.org.fhir/audit-event-action";
-            case D: return "http://hl7.org.fhir/audit-event-action";
-            case E: return "http://hl7.org.fhir/audit-event-action";
+            case C: return "http://hl7.org/fhir/audit-event-action";
+            case R: return "http://hl7.org/fhir/audit-event-action";
+            case U: return "http://hl7.org/fhir/audit-event-action";
+            case D: return "http://hl7.org/fhir/audit-event-action";
+            case E: return "http://hl7.org/fhir/audit-event-action";
             default: return "?";
           }
         }
@@ -205,10 +205,10 @@ public class AuditEvent extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case _0: return "http://hl7.org.fhir/audit-event-outcome";
-            case _4: return "http://hl7.org.fhir/audit-event-outcome";
-            case _8: return "http://hl7.org.fhir/audit-event-outcome";
-            case _12: return "http://hl7.org.fhir/audit-event-outcome";
+            case _0: return "http://hl7.org/fhir/audit-event-outcome";
+            case _4: return "http://hl7.org/fhir/audit-event-outcome";
+            case _8: return "http://hl7.org/fhir/audit-event-outcome";
+            case _12: return "http://hl7.org/fhir/audit-event-outcome";
             default: return "?";
           }
         }
@@ -312,11 +312,11 @@ public class AuditEvent extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case _1: return "http://hl7.org.fhir/network-type";
-            case _2: return "http://hl7.org.fhir/network-type";
-            case _3: return "http://hl7.org.fhir/network-type";
-            case _4: return "http://hl7.org.fhir/network-type";
-            case _5: return "http://hl7.org.fhir/network-type";
+            case _1: return "http://hl7.org/fhir/network-type";
+            case _2: return "http://hl7.org/fhir/network-type";
+            case _3: return "http://hl7.org/fhir/network-type";
+            case _4: return "http://hl7.org/fhir/network-type";
+            case _5: return "http://hl7.org/fhir/network-type";
             default: return "?";
           }
         }
@@ -332,11 +332,11 @@ public class AuditEvent extends DomainResource {
         }
         public String getDisplay() {
           switch (this) {
-            case _1: return " ";
-            case _2: return " ";
-            case _3: return " ";
-            case _4: return " ";
-            case _5: return " ";
+            case _1: return "Machine Name";
+            case _2: return "IP Address";
+            case _3: return "Telephone Number";
+            case _4: return "Email address";
+            case _5: return "URI";
             default: return "?";
           }
         }
@@ -419,10 +419,10 @@ public class AuditEvent extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case _1: return "http://hl7.org.fhir/object-type";
-            case _2: return "http://hl7.org.fhir/object-type";
-            case _3: return "http://hl7.org.fhir/object-type";
-            case _4: return "http://hl7.org.fhir/object-type";
+            case _1: return "http://hl7.org/fhir/object-type";
+            case _2: return "http://hl7.org/fhir/object-type";
+            case _3: return "http://hl7.org/fhir/object-type";
+            case _4: return "http://hl7.org/fhir/object-type";
             default: return "?";
           }
         }
@@ -437,10 +437,10 @@ public class AuditEvent extends DomainResource {
         }
         public String getDisplay() {
           switch (this) {
-            case _1: return " ";
-            case _2: return " ";
-            case _3: return " ";
-            case _4: return " ";
+            case _1: return "Person";
+            case _2: return "System Object";
+            case _3: return "Organization";
+            case _4: return "Other";
             default: return "?";
           }
         }
@@ -659,30 +659,30 @@ public class AuditEvent extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case _1: return "http://hl7.org.fhir/object-role";
-            case _2: return "http://hl7.org.fhir/object-role";
-            case _3: return "http://hl7.org.fhir/object-role";
-            case _4: return "http://hl7.org.fhir/object-role";
-            case _5: return "http://hl7.org.fhir/object-role";
-            case _6: return "http://hl7.org.fhir/object-role";
-            case _7: return "http://hl7.org.fhir/object-role";
-            case _8: return "http://hl7.org.fhir/object-role";
-            case _9: return "http://hl7.org.fhir/object-role";
-            case _10: return "http://hl7.org.fhir/object-role";
-            case _11: return "http://hl7.org.fhir/object-role";
-            case _12: return "http://hl7.org.fhir/object-role";
-            case _13: return "http://hl7.org.fhir/object-role";
-            case _14: return "http://hl7.org.fhir/object-role";
-            case _15: return "http://hl7.org.fhir/object-role";
-            case _16: return "http://hl7.org.fhir/object-role";
-            case _17: return "http://hl7.org.fhir/object-role";
-            case _18: return "http://hl7.org.fhir/object-role";
-            case _19: return "http://hl7.org.fhir/object-role";
-            case _20: return "http://hl7.org.fhir/object-role";
-            case _21: return "http://hl7.org.fhir/object-role";
-            case _22: return "http://hl7.org.fhir/object-role";
-            case _23: return "http://hl7.org.fhir/object-role";
-            case _24: return "http://hl7.org.fhir/object-role";
+            case _1: return "http://hl7.org/fhir/object-role";
+            case _2: return "http://hl7.org/fhir/object-role";
+            case _3: return "http://hl7.org/fhir/object-role";
+            case _4: return "http://hl7.org/fhir/object-role";
+            case _5: return "http://hl7.org/fhir/object-role";
+            case _6: return "http://hl7.org/fhir/object-role";
+            case _7: return "http://hl7.org/fhir/object-role";
+            case _8: return "http://hl7.org/fhir/object-role";
+            case _9: return "http://hl7.org/fhir/object-role";
+            case _10: return "http://hl7.org/fhir/object-role";
+            case _11: return "http://hl7.org/fhir/object-role";
+            case _12: return "http://hl7.org/fhir/object-role";
+            case _13: return "http://hl7.org/fhir/object-role";
+            case _14: return "http://hl7.org/fhir/object-role";
+            case _15: return "http://hl7.org/fhir/object-role";
+            case _16: return "http://hl7.org/fhir/object-role";
+            case _17: return "http://hl7.org/fhir/object-role";
+            case _18: return "http://hl7.org/fhir/object-role";
+            case _19: return "http://hl7.org/fhir/object-role";
+            case _20: return "http://hl7.org/fhir/object-role";
+            case _21: return "http://hl7.org/fhir/object-role";
+            case _22: return "http://hl7.org/fhir/object-role";
+            case _23: return "http://hl7.org/fhir/object-role";
+            case _24: return "http://hl7.org/fhir/object-role";
             default: return "?";
           }
         }
@@ -976,21 +976,21 @@ public class AuditEvent extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case _1: return "http://hl7.org.fhir/object-lifecycle";
-            case _2: return "http://hl7.org.fhir/object-lifecycle";
-            case _3: return "http://hl7.org.fhir/object-lifecycle";
-            case _4: return "http://hl7.org.fhir/object-lifecycle";
-            case _5: return "http://hl7.org.fhir/object-lifecycle";
-            case _6: return "http://hl7.org.fhir/object-lifecycle";
-            case _7: return "http://hl7.org.fhir/object-lifecycle";
-            case _8: return "http://hl7.org.fhir/object-lifecycle";
-            case _9: return "http://hl7.org.fhir/object-lifecycle";
-            case _10: return "http://hl7.org.fhir/object-lifecycle";
-            case _11: return "http://hl7.org.fhir/object-lifecycle";
-            case _12: return "http://hl7.org.fhir/object-lifecycle";
-            case _13: return "http://hl7.org.fhir/object-lifecycle";
-            case _14: return "http://hl7.org.fhir/object-lifecycle";
-            case _15: return "http://hl7.org.fhir/object-lifecycle";
+            case _1: return "http://hl7.org/fhir/object-lifecycle";
+            case _2: return "http://hl7.org/fhir/object-lifecycle";
+            case _3: return "http://hl7.org/fhir/object-lifecycle";
+            case _4: return "http://hl7.org/fhir/object-lifecycle";
+            case _5: return "http://hl7.org/fhir/object-lifecycle";
+            case _6: return "http://hl7.org/fhir/object-lifecycle";
+            case _7: return "http://hl7.org/fhir/object-lifecycle";
+            case _8: return "http://hl7.org/fhir/object-lifecycle";
+            case _9: return "http://hl7.org/fhir/object-lifecycle";
+            case _10: return "http://hl7.org/fhir/object-lifecycle";
+            case _11: return "http://hl7.org/fhir/object-lifecycle";
+            case _12: return "http://hl7.org/fhir/object-lifecycle";
+            case _13: return "http://hl7.org/fhir/object-lifecycle";
+            case _14: return "http://hl7.org/fhir/object-lifecycle";
+            case _15: return "http://hl7.org/fhir/object-lifecycle";
             default: return "?";
           }
         }
@@ -1016,21 +1016,21 @@ public class AuditEvent extends DomainResource {
         }
         public String getDisplay() {
           switch (this) {
-            case _1: return " ";
-            case _2: return " ";
-            case _3: return " ";
-            case _4: return " ";
-            case _5: return " ";
-            case _6: return " ";
-            case _7: return " ";
-            case _8: return " ";
-            case _9: return " ";
-            case _10: return "  ";
-            case _11: return "  ";
-            case _12: return "  ";
-            case _13: return "  ";
-            case _14: return "  ";
-            case _15: return "  ";
+            case _1: return "Origination / Creation";
+            case _2: return "Import / Copy from original";
+            case _3: return "Amendment";
+            case _4: return "Verification";
+            case _5: return "Translation";
+            case _6: return "Access / Use";
+            case _7: return "De-identification";
+            case _8: return "Aggregation, summarization, derivation";
+            case _9: return "Report";
+            case _10: return "Export / Copy to target";
+            case _11: return "Disclosure";
+            case _12: return "Receipt of disclosure";
+            case _13: return "Archiving";
+            case _14: return "Logical deletion";
+            case _15: return "Permanent erasure / Physical destruction";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base.java

@@ -54,6 +54,12 @@ private Map<String, Object> userData;
     return (String) getUserData(name);
   }
 
+  public int getUserInt(String name) {
+    if (!hasUserData(name))
+      return 0;
+    return (Integer) getUserData(name);
+  }
+
   public boolean hasFormatComment() {
   	return (formatComments != null && !formatComments.isEmpty());
   }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseReference.java

@@ -1,10 +1,10 @@
 package org.hl7.fhir.instance.model;
 
+import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseReference;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.instance.model.api.IAnyResource;
 
 public abstract class BaseReference extends Type implements IBaseReference, ICompositeType {
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -63,7 +63,7 @@ public class Basic extends DomainResource {
      * Identifies the patient, practitioner, device or any other resource that is the "focus" of this resoruce.
      */
     @Child(name = "subject", type = {}, order=2, min=0, max=1)
-    @Description(shortDefinition="Identifies the", formalDefinition="Identifies the patient, practitioner, device or any other resource that is the 'focus' of this resoruce." )
+    @Description(shortDefinition="Identifies the focus of this resource", formalDefinition="Identifies the patient, practitioner, device or any other resource that is the 'focus' of this resoruce." )
     protected Reference subject;
 
     /**
@@ -360,11 +360,11 @@ public class Basic extends DomainResource {
 
   @SearchParamDefinition(name="code", path="Basic.code", description="Kind of Resource", type="token" )
   public static final String SP_CODE = "code";
-  @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the", type="reference" )
+  @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the focus of this resource", type="reference" )
   public static final String SP_SUBJECT = "subject";
   @SearchParamDefinition(name="created", path="Basic.created", description="When created", type="date" )
   public static final String SP_CREATED = "created";
-  @SearchParamDefinition(name="patient", path="Basic.subject", description="Identifies the", type="reference" )
+  @SearchParamDefinition(name="patient", path="Basic.subject", description="Identifies the focus of this resource", type="reference" )
   public static final String SP_PATIENT = "patient";
   @SearchParamDefinition(name="author", path="Basic.author", description="Who created", type="reference" )
   public static final String SP_AUTHOR = "author";

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -113,13 +113,13 @@ public class Bundle extends Resource implements IBaseBundle {
         }
         public String getSystem() {
           switch (this) {
-            case DOCUMENT: return "http://hl7.org.fhir/bundle-type";
-            case MESSAGE: return "http://hl7.org.fhir/bundle-type";
-            case TRANSACTION: return "http://hl7.org.fhir/bundle-type";
-            case TRANSACTIONRESPONSE: return "http://hl7.org.fhir/bundle-type";
-            case HISTORY: return "http://hl7.org.fhir/bundle-type";
-            case SEARCHSET: return "http://hl7.org.fhir/bundle-type";
-            case COLLECTION: return "http://hl7.org.fhir/bundle-type";
+            case DOCUMENT: return "http://hl7.org/fhir/bundle-type";
+            case MESSAGE: return "http://hl7.org/fhir/bundle-type";
+            case TRANSACTION: return "http://hl7.org/fhir/bundle-type";
+            case TRANSACTIONRESPONSE: return "http://hl7.org/fhir/bundle-type";
+            case HISTORY: return "http://hl7.org/fhir/bundle-type";
+            case SEARCHSET: return "http://hl7.org/fhir/bundle-type";
+            case COLLECTION: return "http://hl7.org/fhir/bundle-type";
             default: return "?";
           }
         }
@@ -198,6 +198,10 @@ public class Bundle extends Resource implements IBaseBundle {
          * This resource is returned because it is referred to from another resource in the search set
          */
         INCLUDE, 
+        /**
+         * An OperationOutcome that provides additional information about the processing of a search
+         */
+        OUTCOME, 
         /**
          * added to help the parsers
          */
@@ -209,19 +213,23 @@ public class Bundle extends Resource implements IBaseBundle {
           return MATCH;
         if ("include".equals(codeString))
           return INCLUDE;
+        if ("outcome".equals(codeString))
+          return OUTCOME;
         throw new Exception("Unknown SearchEntryMode code '"+codeString+"'");
         }
         public String toCode() {
           switch (this) {
             case MATCH: return "match";
             case INCLUDE: return "include";
+            case OUTCOME: return "outcome";
             default: return "?";
           }
         }
         public String getSystem() {
           switch (this) {
-            case MATCH: return "http://hl7.org.fhir/search-entry-mode";
-            case INCLUDE: return "http://hl7.org.fhir/search-entry-mode";
+            case MATCH: return "http://hl7.org/fhir/search-entry-mode";
+            case INCLUDE: return "http://hl7.org/fhir/search-entry-mode";
+            case OUTCOME: return "http://hl7.org/fhir/search-entry-mode";
             default: return "?";
           }
         }
@@ -229,6 +237,7 @@ public class Bundle extends Resource implements IBaseBundle {
           switch (this) {
             case MATCH: return "This resource matched the search specification";
             case INCLUDE: return "This resource is returned because it is referred to from another resource in the search set";
+            case OUTCOME: return "An OperationOutcome that provides additional information about the processing of a search";
             default: return "?";
           }
         }
@@ -236,6 +245,7 @@ public class Bundle extends Resource implements IBaseBundle {
           switch (this) {
             case MATCH: return "match";
             case INCLUDE: return "include";
+            case OUTCOME: return "outcome";
             default: return "?";
           }
         }
@@ -250,6 +260,8 @@ public class Bundle extends Resource implements IBaseBundle {
           return SearchEntryMode.MATCH;
         if ("include".equals(codeString))
           return SearchEntryMode.INCLUDE;
+        if ("outcome".equals(codeString))
+          return SearchEntryMode.OUTCOME;
         throw new IllegalArgumentException("Unknown SearchEntryMode code '"+codeString+"'");
         }
     public String toCode(SearchEntryMode code) {
@@ -257,6 +269,8 @@ public class Bundle extends Resource implements IBaseBundle {
         return "match";
       if (code == SearchEntryMode.INCLUDE)
         return "include";
+      if (code == SearchEntryMode.OUTCOME)
+        return "outcome";
       return "?";
       }
     }
@@ -306,10 +320,10 @@ public class Bundle extends Resource implements IBaseBundle {
         }
         public String getSystem() {
           switch (this) {
-            case GET: return "http://hl7.org.fhir/http-verb";
-            case POST: return "http://hl7.org.fhir/http-verb";
-            case PUT: return "http://hl7.org.fhir/http-verb";
-            case DELETE: return "http://hl7.org.fhir/http-verb";
+            case GET: return "http://hl7.org/fhir/http-verb";
+            case POST: return "http://hl7.org/fhir/http-verb";
+            case PUT: return "http://hl7.org/fhir/http-verb";
+            case DELETE: return "http://hl7.org/fhir/http-verb";
             default: return "?";
           }
         }
@@ -546,7 +560,7 @@ public class Bundle extends Resource implements IBaseBundle {
          * The Resources for the entry.
          */
         @Child(name = "resource", type = {Resource.class}, order=3, min=0, max=1)
-        @Description(shortDefinition="Resources in this bundle", formalDefinition="The Resources for the entry." )
+        @Description(shortDefinition="A resource in the bundle", formalDefinition="The Resources for the entry." )
         protected Resource resource;
 
         /**
@@ -821,7 +835,7 @@ public class Bundle extends Resource implements IBaseBundle {
          * Why this entry is in the result set - whether it's included as a match or because of an _include requirement.
          */
         @Child(name = "mode", type = {CodeType.class}, order=1, min=0, max=1)
-        @Description(shortDefinition="match | include - why this is in the result set", formalDefinition="Why this entry is in the result set - whether it's included as a match or because of an _include requirement." )
+        @Description(shortDefinition="match | include | outcome - why this is in the result set", formalDefinition="Why this entry is in the result set - whether it's included as a match or because of an _include requirement." )
         protected Enumeration<SearchEntryMode> mode;
 
         /**
@@ -989,10 +1003,10 @@ public class Bundle extends Resource implements IBaseBundle {
         protected Enumeration<HTTPVerb> method;
 
         /**
-         * A search URL for this resource that specifies how the resource is matched to an existing resource when processing a transaction (see transaction documentation).
+         * The URL for this entry, relative to the root.
          */
         @Child(name = "url", type = {UriType.class}, order=2, min=1, max=1)
-        @Description(shortDefinition="The URL for the transaction", formalDefinition="A search URL for this resource that specifies how the resource is matched to an existing resource when processing a transaction (see transaction documentation)." )
+        @Description(shortDefinition="URL for HTTP equivalent of this entry", formalDefinition="The URL for this entry, relative to the root." )
         protected UriType url;
 
         /**
@@ -1087,7 +1101,7 @@ public class Bundle extends Resource implements IBaseBundle {
         }
 
         /**
-         * @return {@link #url} (A search URL for this resource that specifies how the resource is matched to an existing resource when processing a transaction (see transaction documentation).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+         * @return {@link #url} (The URL for this entry, relative to the root.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
          */
         public UriType getUrlElement() { 
           if (this.url == null)
@@ -1107,7 +1121,7 @@ public class Bundle extends Resource implements IBaseBundle {
         }
 
         /**
-         * @param value {@link #url} (A search URL for this resource that specifies how the resource is matched to an existing resource when processing a transaction (see transaction documentation).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+         * @param value {@link #url} (The URL for this entry, relative to the root.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
          */
         public BundleEntryTransactionComponent setUrlElement(UriType value) { 
           this.url = value;
@@ -1115,14 +1129,14 @@ public class Bundle extends Resource implements IBaseBundle {
         }
 
         /**
-         * @return A search URL for this resource that specifies how the resource is matched to an existing resource when processing a transaction (see transaction documentation).
+         * @return The URL for this entry, relative to the root.
          */
         public String getUrl() { 
           return this.url == null ? null : this.url.getValue();
         }
 
         /**
-         * @param value A search URL for this resource that specifies how the resource is matched to an existing resource when processing a transaction (see transaction documentation).
+         * @param value The URL for this entry, relative to the root.
          */
         public BundleEntryTransactionComponent setUrl(String value) { 
             if (this.url == null)
@@ -1330,7 +1344,7 @@ public class Bundle extends Resource implements IBaseBundle {
         protected void listChildren(List<Property> childrenList) {
           super.listChildren(childrenList);
           childrenList.add(new Property("method", "code", "The HTTP verb for this entry in either a update history, or a transaction/ transaction response.", 0, java.lang.Integer.MAX_VALUE, method));
-          childrenList.add(new Property("url", "uri", "A search URL for this resource that specifies how the resource is matched to an existing resource when processing a transaction (see transaction documentation).", 0, java.lang.Integer.MAX_VALUE, url));
+          childrenList.add(new Property("url", "uri", "The URL for this entry, relative to the root.", 0, java.lang.Integer.MAX_VALUE, url));
           childrenList.add(new Property("ifNoneMatch", "string", "If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation.", 0, java.lang.Integer.MAX_VALUE, ifNoneMatch));
           childrenList.add(new Property("ifMatch", "string", "Only perform the operation if the Etag value matches. For more information, see the API section 'Managing Resource Contention'.", 0, java.lang.Integer.MAX_VALUE, ifMatch));
           childrenList.add(new Property("ifModifiedSince", "instant", "Only perform the operation if the last updated date matches. For more information, see the API section 'Managing Resource Contention'.", 0, java.lang.Integer.MAX_VALUE, ifModifiedSince));

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -84,9 +84,9 @@ public class CarePlan extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PLANNED: return "http://hl7.org.fhir/care-plan-status";
-            case ACTIVE: return "http://hl7.org.fhir/care-plan-status";
-            case COMPLETED: return "http://hl7.org.fhir/care-plan-status";
+            case PLANNED: return "http://hl7.org/fhir/care-plan-status";
+            case ACTIVE: return "http://hl7.org/fhir/care-plan-status";
+            case COMPLETED: return "http://hl7.org/fhir/care-plan-status";
             default: return "?";
           }
         }
@@ -198,13 +198,13 @@ public class CarePlan extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case DIET: return "http://hl7.org.fhir/care-plan-activity-category";
-            case DRUG: return "http://hl7.org.fhir/care-plan-activity-category";
-            case ENCOUNTER: return "http://hl7.org.fhir/care-plan-activity-category";
-            case OBSERVATION: return "http://hl7.org.fhir/care-plan-activity-category";
-            case PROCEDURE: return "http://hl7.org.fhir/care-plan-activity-category";
-            case SUPPLY: return "http://hl7.org.fhir/care-plan-activity-category";
-            case OTHER: return "http://hl7.org.fhir/care-plan-activity-category";
+            case DIET: return "http://hl7.org/fhir/care-plan-activity-category";
+            case DRUG: return "http://hl7.org/fhir/care-plan-activity-category";
+            case ENCOUNTER: return "http://hl7.org/fhir/care-plan-activity-category";
+            case OBSERVATION: return "http://hl7.org/fhir/care-plan-activity-category";
+            case PROCEDURE: return "http://hl7.org/fhir/care-plan-activity-category";
+            case SUPPLY: return "http://hl7.org/fhir/care-plan-activity-category";
+            case OTHER: return "http://hl7.org/fhir/care-plan-activity-category";
             default: return "?";
           }
         }
@@ -333,12 +333,12 @@ public class CarePlan extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case NOTSTARTED: return "http://hl7.org.fhir/care-plan-activity-status";
-            case SCHEDULED: return "http://hl7.org.fhir/care-plan-activity-status";
-            case INPROGRESS: return "http://hl7.org.fhir/care-plan-activity-status";
-            case ONHOLD: return "http://hl7.org.fhir/care-plan-activity-status";
-            case COMPLETED: return "http://hl7.org.fhir/care-plan-activity-status";
-            case CANCELLED: return "http://hl7.org.fhir/care-plan-activity-status";
+            case NOTSTARTED: return "http://hl7.org/fhir/care-plan-activity-status";
+            case SCHEDULED: return "http://hl7.org/fhir/care-plan-activity-status";
+            case INPROGRESS: return "http://hl7.org/fhir/care-plan-activity-status";
+            case ONHOLD: return "http://hl7.org/fhir/care-plan-activity-status";
+            case COMPLETED: return "http://hl7.org/fhir/care-plan-activity-status";
+            case CANCELLED: return "http://hl7.org/fhir/care-plan-activity-status";
             default: return "?";
           }
         }
@@ -1027,6 +1027,10 @@ public class CarePlan extends DomainResource {
           return (CodeableConcept) this.reason;
         }
 
+        public boolean hasReasonCodeableConcept() throws Exception { 
+          return this.reason instanceof CodeableConcept;
+        }
+
         /**
          * @return {@link #reason} (Provides the health condition(s) or other rationale that drove the inclusion of this particular activity as part of the plan.)
          */
@@ -1036,6 +1040,10 @@ public class CarePlan extends DomainResource {
           return (Reference) this.reason;
         }
 
+        public boolean hasReasonReference() throws Exception { 
+          return this.reason instanceof Reference;
+        }
+
         public boolean hasReason() { 
           return this.reason != null && !this.reason.isEmpty();
         }
@@ -1243,6 +1251,10 @@ public class CarePlan extends DomainResource {
           return (Timing) this.scheduled;
         }
 
+        public boolean hasScheduledTiming() throws Exception { 
+          return this.scheduled instanceof Timing;
+        }
+
         /**
          * @return {@link #scheduled} (The period, timing or frequency upon which the described activity is to occur.)
          */
@@ -1252,6 +1264,10 @@ public class CarePlan extends DomainResource {
           return (Period) this.scheduled;
         }
 
+        public boolean hasScheduledPeriod() throws Exception { 
+          return this.scheduled instanceof Period;
+        }
+
         /**
          * @return {@link #scheduled} (The period, timing or frequency upon which the described activity is to occur.)
          */
@@ -1261,6 +1277,10 @@ public class CarePlan extends DomainResource {
           return (StringType) this.scheduled;
         }
 
+        public boolean hasScheduledStringType() throws Exception { 
+          return this.scheduled instanceof StringType;
+        }
+
         public boolean hasScheduled() { 
           return this.scheduled != null && !this.scheduled.isEmpty();
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -100,11 +100,11 @@ public class Claim extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case INSTITUTIONAL: return "http://hl7.org.fhir/type-link";
-            case ORAL: return "http://hl7.org.fhir/type-link";
-            case PHARMACY: return "http://hl7.org.fhir/type-link";
-            case PROFESSIONAL: return "http://hl7.org.fhir/type-link";
-            case VISION: return "http://hl7.org.fhir/type-link";
+            case INSTITUTIONAL: return "http://hl7.org/fhir/type-link";
+            case ORAL: return "http://hl7.org/fhir/type-link";
+            case PHARMACY: return "http://hl7.org/fhir/type-link";
+            case PROFESSIONAL: return "http://hl7.org/fhir/type-link";
+            case VISION: return "http://hl7.org/fhir/type-link";
             default: return "?";
           }
         }
@@ -207,10 +207,10 @@ public class Claim extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case COMPLETE: return "http://hl7.org.fhir/use-link";
-            case PROPOSED: return "http://hl7.org.fhir/use-link";
-            case EXPLORATORY: return "http://hl7.org.fhir/use-link";
-            case OTHER: return "http://hl7.org.fhir/use-link";
+            case COMPLETE: return "http://hl7.org/fhir/use-link";
+            case PROPOSED: return "http://hl7.org/fhir/use-link";
+            case EXPLORATORY: return "http://hl7.org/fhir/use-link";
+            case OTHER: return "http://hl7.org/fhir/use-link";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -84,9 +84,9 @@ public class ClinicalImpression extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case INPROGRESS: return "http://hl7.org.fhir/clinical-impression-status";
-            case COMPLETED: return "http://hl7.org.fhir/clinical-impression-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/clinical-impression-status";
+            case INPROGRESS: return "http://hl7.org/fhir/clinical-impression-status";
+            case COMPLETED: return "http://hl7.org/fhir/clinical-impression-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/clinical-impression-status";
             default: return "?";
           }
         }
@@ -1089,6 +1089,10 @@ public class ClinicalImpression extends DomainResource {
       return (CodeableConcept) this.trigger;
     }
 
+    public boolean hasTriggerCodeableConcept() throws Exception { 
+      return this.trigger instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #trigger} (The request or event that necessitated this assessment. This may be a diagnosis, a Care Plan, a Request Referral, or some other resource.)
      */
@@ -1098,6 +1102,10 @@ public class ClinicalImpression extends DomainResource {
       return (Reference) this.trigger;
     }
 
+    public boolean hasTriggerReference() throws Exception { 
+      return this.trigger instanceof Reference;
+    }
+
     public boolean hasTrigger() { 
       return this.trigger != null && !this.trigger.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -74,13 +74,13 @@ public class Coding extends Type implements IBaseCoding, ICompositeType {
     protected StringType display;
 
     /**
-     * Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays).
+     * Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays).
      */
-    @Child(name = "primary", type = {BooleanType.class}, order=4, min=0, max=1)
-    @Description(shortDefinition="If this code was chosen directly by the user", formalDefinition="Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays)." )
-    protected BooleanType primary;
+    @Child(name = "userSelected", type = {BooleanType.class}, order=4, min=0, max=1)
+    @Description(shortDefinition="If this coding was chosen directly by the user", formalDefinition="Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays)." )
+    protected BooleanType userSelected;
 
-    private static final long serialVersionUID = 2019442517L;
+    private static final long serialVersionUID = -1417514061L;
 
   /*
    * Constructor
@@ -286,47 +286,47 @@ public class Coding extends Type implements IBaseCoding, ICompositeType {
     }
 
     /**
-     * @return {@link #primary} (Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays).). This is the underlying object with id, value and extensions. The accessor "getPrimary" gives direct access to the value
+     * @return {@link #userSelected} (Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays).). This is the underlying object with id, value and extensions. The accessor "getUserSelected" gives direct access to the value
      */
-    public BooleanType getPrimaryElement() { 
-      if (this.primary == null)
+    public BooleanType getUserSelectedElement() { 
+      if (this.userSelected == null)
         if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create Coding.primary");
+          throw new Error("Attempt to auto-create Coding.userSelected");
         else if (Configuration.doAutoCreate())
-          this.primary = new BooleanType(); // bb
-      return this.primary;
+          this.userSelected = new BooleanType(); // bb
+      return this.userSelected;
     }
 
-    public boolean hasPrimaryElement() { 
-      return this.primary != null && !this.primary.isEmpty();
+    public boolean hasUserSelectedElement() { 
+      return this.userSelected != null && !this.userSelected.isEmpty();
     }
 
-    public boolean hasPrimary() { 
-      return this.primary != null && !this.primary.isEmpty();
+    public boolean hasUserSelected() { 
+      return this.userSelected != null && !this.userSelected.isEmpty();
     }
 
     /**
-     * @param value {@link #primary} (Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays).). This is the underlying object with id, value and extensions. The accessor "getPrimary" gives direct access to the value
+     * @param value {@link #userSelected} (Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays).). This is the underlying object with id, value and extensions. The accessor "getUserSelected" gives direct access to the value
      */
-    public Coding setPrimaryElement(BooleanType value) { 
-      this.primary = value;
+    public Coding setUserSelectedElement(BooleanType value) { 
+      this.userSelected = value;
       return this;
     }
 
     /**
-     * @return Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays).
+     * @return Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays).
      */
-    public boolean getPrimary() { 
-      return this.primary == null || this.primary.isEmpty() ? false : this.primary.getValue();
+    public boolean getUserSelected() { 
+      return this.userSelected == null || this.userSelected.isEmpty() ? false : this.userSelected.getValue();
     }
 
     /**
-     * @param value Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays).
+     * @param value Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays).
      */
-    public Coding setPrimary(boolean value) { 
-        if (this.primary == null)
-          this.primary = new BooleanType();
-        this.primary.setValue(value);
+    public Coding setUserSelected(boolean value) { 
+        if (this.userSelected == null)
+          this.userSelected = new BooleanType();
+        this.userSelected.setValue(value);
       return this;
     }
 
@@ -336,7 +336,7 @@ public class Coding extends Type implements IBaseCoding, ICompositeType {
         childrenList.add(new Property("version", "string", "The version of the code system which was used when choosing this code. Note that a well-maintained code system does not need the version reported, because the meaning of codes is consistent across versions. However this cannot consistently be assured. and when the meaning is not guaranteed to be consistent, the version SHOULD be exchanged.", 0, java.lang.Integer.MAX_VALUE, version));
         childrenList.add(new Property("code", "code", "A symbol in syntax defined by the system. The symbol may be a predefined code or an expression in a syntax defined by the coding system (e.g. post-coordination).", 0, java.lang.Integer.MAX_VALUE, code));
         childrenList.add(new Property("display", "string", "A representation of the meaning of the code in the system, following the rules of the system.", 0, java.lang.Integer.MAX_VALUE, display));
-        childrenList.add(new Property("primary", "boolean", "Indicates that this code was chosen by a user directly - i.e. off a pick list of available items (codes or displays).", 0, java.lang.Integer.MAX_VALUE, primary));
+        childrenList.add(new Property("userSelected", "boolean", "Indicates that this coding was chosen by a user directly - i.e. off a pick list of available items (codes or displays).", 0, java.lang.Integer.MAX_VALUE, userSelected));
       }
 
       public Coding copy() {
@@ -346,7 +346,7 @@ public class Coding extends Type implements IBaseCoding, ICompositeType {
         dst.version = version == null ? null : version.copy();
         dst.code = code == null ? null : code.copy();
         dst.display = display == null ? null : display.copy();
-        dst.primary = primary == null ? null : primary.copy();
+        dst.userSelected = userSelected == null ? null : userSelected.copy();
         return dst;
       }
 
@@ -362,7 +362,7 @@ public class Coding extends Type implements IBaseCoding, ICompositeType {
           return false;
         Coding o = (Coding) other;
         return compareDeep(system, o.system, true) && compareDeep(version, o.version, true) && compareDeep(code, o.code, true)
-           && compareDeep(display, o.display, true) && compareDeep(primary, o.primary, true);
+           && compareDeep(display, o.display, true) && compareDeep(userSelected, o.userSelected, true);
       }
 
       @Override
@@ -373,12 +373,12 @@ public class Coding extends Type implements IBaseCoding, ICompositeType {
           return false;
         Coding o = (Coding) other;
         return compareValues(system, o.system, true) && compareValues(version, o.version, true) && compareValues(code, o.code, true)
-           && compareValues(display, o.display, true) && compareValues(primary, o.primary, true);
+           && compareValues(display, o.display, true) && compareValues(userSelected, o.userSelected, true);
       }
 
       public boolean isEmpty() {
         return super.isEmpty() && (system == null || system.isEmpty()) && (version == null || version.isEmpty())
-           && (code == null || code.isEmpty()) && (display == null || display.isEmpty()) && (primary == null || primary.isEmpty())
+           && (code == null || code.isEmpty()) && (display == null || display.isEmpty()) && (userSelected == null || userSelected.isEmpty())
           ;
       }
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -98,11 +98,11 @@ public class Communication extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case INPROGRESS: return "http://hl7.org.fhir/communication-status";
-            case COMPLETED: return "http://hl7.org.fhir/communication-status";
-            case SUSPENDED: return "http://hl7.org.fhir/communication-status";
-            case REJECTED: return "http://hl7.org.fhir/communication-status";
-            case FAILED: return "http://hl7.org.fhir/communication-status";
+            case INPROGRESS: return "http://hl7.org/fhir/communication-status";
+            case COMPLETED: return "http://hl7.org/fhir/communication-status";
+            case SUSPENDED: return "http://hl7.org/fhir/communication-status";
+            case REJECTED: return "http://hl7.org/fhir/communication-status";
+            case FAILED: return "http://hl7.org/fhir/communication-status";
             default: return "?";
           }
         }
@@ -202,6 +202,10 @@ public class Communication extends DomainResource {
           return (StringType) this.content;
         }
 
+        public boolean hasContentStringType() throws Exception { 
+          return this.content instanceof StringType;
+        }
+
         /**
          * @return {@link #content} (An individual message part for multi-part messages.)
          */
@@ -211,6 +215,10 @@ public class Communication extends DomainResource {
           return (Attachment) this.content;
         }
 
+        public boolean hasContentAttachment() throws Exception { 
+          return this.content instanceof Attachment;
+        }
+
         /**
          * @return {@link #content} (An individual message part for multi-part messages.)
          */
@@ -220,6 +228,10 @@ public class Communication extends DomainResource {
           return (Reference) this.content;
         }
 
+        public boolean hasContentReference() throws Exception { 
+          return this.content instanceof Reference;
+        }
+
         public boolean hasContent() { 
           return this.content != null && !this.content.isEmpty();
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -133,16 +133,16 @@ public class CommunicationRequest extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PROPOSED: return "http://hl7.org.fhir/communication-request-status";
-            case PLANNED: return "http://hl7.org.fhir/communication-request-status";
-            case REQUESTED: return "http://hl7.org.fhir/communication-request-status";
-            case RECEIVED: return "http://hl7.org.fhir/communication-request-status";
-            case ACCEPTED: return "http://hl7.org.fhir/communication-request-status";
-            case INPROGRESS: return "http://hl7.org.fhir/communication-request-status";
-            case COMPLETED: return "http://hl7.org.fhir/communication-request-status";
-            case SUSPENDED: return "http://hl7.org.fhir/communication-request-status";
-            case REJECTED: return "http://hl7.org.fhir/communication-request-status";
-            case FAILED: return "http://hl7.org.fhir/communication-request-status";
+            case PROPOSED: return "http://hl7.org/fhir/communication-request-status";
+            case PLANNED: return "http://hl7.org/fhir/communication-request-status";
+            case REQUESTED: return "http://hl7.org/fhir/communication-request-status";
+            case RECEIVED: return "http://hl7.org/fhir/communication-request-status";
+            case ACCEPTED: return "http://hl7.org/fhir/communication-request-status";
+            case INPROGRESS: return "http://hl7.org/fhir/communication-request-status";
+            case COMPLETED: return "http://hl7.org/fhir/communication-request-status";
+            case SUSPENDED: return "http://hl7.org/fhir/communication-request-status";
+            case REJECTED: return "http://hl7.org/fhir/communication-request-status";
+            case FAILED: return "http://hl7.org/fhir/communication-request-status";
             default: return "?";
           }
         }
@@ -272,6 +272,10 @@ public class CommunicationRequest extends DomainResource {
           return (StringType) this.content;
         }
 
+        public boolean hasContentStringType() throws Exception { 
+          return this.content instanceof StringType;
+        }
+
         /**
          * @return {@link #content} (An individual message part for multi-part messages.)
          */
@@ -281,6 +285,10 @@ public class CommunicationRequest extends DomainResource {
           return (Attachment) this.content;
         }
 
+        public boolean hasContentAttachment() throws Exception { 
+          return this.content instanceof Attachment;
+        }
+
         /**
          * @return {@link #content} (An individual message part for multi-part messages.)
          */
@@ -290,6 +298,10 @@ public class CommunicationRequest extends DomainResource {
           return (Reference) this.content;
         }
 
+        public boolean hasContentReference() throws Exception { 
+          return this.content instanceof Reference;
+        }
+
         public boolean hasContent() { 
           return this.content != null && !this.content.isEmpty();
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -98,11 +98,11 @@ public class Composition extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PRELIMINARY: return "http://hl7.org.fhir/composition-status";
-            case FINAL: return "http://hl7.org.fhir/composition-status";
-            case APPENDED: return "http://hl7.org.fhir/composition-status";
-            case AMENDED: return "http://hl7.org.fhir/composition-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/composition-status";
+            case PRELIMINARY: return "http://hl7.org/fhir/composition-status";
+            case FINAL: return "http://hl7.org/fhir/composition-status";
+            case APPENDED: return "http://hl7.org/fhir/composition-status";
+            case AMENDED: return "http://hl7.org/fhir/composition-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/composition-status";
             default: return "?";
           }
         }
@@ -205,10 +205,10 @@ public class Composition extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PERSONAL: return "http://hl7.org.fhir/composition-attestation-mode";
-            case PROFESSIONAL: return "http://hl7.org.fhir/composition-attestation-mode";
-            case LEGAL: return "http://hl7.org.fhir/composition-attestation-mode";
-            case OFFICIAL: return "http://hl7.org.fhir/composition-attestation-mode";
+            case PERSONAL: return "http://hl7.org/fhir/composition-attestation-mode";
+            case PROFESSIONAL: return "http://hl7.org/fhir/composition-attestation-mode";
+            case LEGAL: return "http://hl7.org/fhir/composition-attestation-mode";
+            case OFFICIAL: return "http://hl7.org/fhir/composition-attestation-mode";
             default: return "?";
           }
         }
@@ -964,7 +964,7 @@ public class Composition extends DomainResource {
     /**
      * A categorization for the type of the composition. This may be implied by or derived from the code specified in the Composition Type.
      */
-    @Child(name = "class", type = {CodeableConcept.class}, order=3, min=0, max=1)
+    @Child(name = "class_", type = {CodeableConcept.class}, order=3, min=0, max=1)
     @Description(shortDefinition="Categorization of Composition", formalDefinition="A categorization for the type of the composition. This may be implied by or derived from the code specified in the Composition Type." )
     protected CodeableConcept class_;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -105,12 +105,12 @@ public class Condition extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PROVISIONAL: return "http://hl7.org.fhir/condition-status";
-            case WORKING: return "http://hl7.org.fhir/condition-status";
-            case CONFIRMED: return "http://hl7.org.fhir/condition-status";
-            case REFUTED: return "http://hl7.org.fhir/condition-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/condition-status";
-            case UNKNOWN: return "http://hl7.org.fhir/condition-status";
+            case PROVISIONAL: return "http://hl7.org/fhir/condition-status";
+            case WORKING: return "http://hl7.org/fhir/condition-status";
+            case CONFIRMED: return "http://hl7.org/fhir/condition-status";
+            case REFUTED: return "http://hl7.org/fhir/condition-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/condition-status";
+            case UNKNOWN: return "http://hl7.org/fhir/condition-status";
             default: return "?";
           }
         }
@@ -504,6 +504,10 @@ public class Condition extends DomainResource {
           return (CodeableConcept) this.site;
         }
 
+        public boolean hasSiteCodeableConcept() throws Exception { 
+          return this.site instanceof CodeableConcept;
+        }
+
         /**
          * @return {@link #site} (Code that identifies the structural location.)
          */
@@ -513,6 +517,10 @@ public class Condition extends DomainResource {
           return (Reference) this.site;
         }
 
+        public boolean hasSiteReference() throws Exception { 
+          return this.site instanceof Reference;
+        }
+
         public boolean hasSite() { 
           return this.site != null && !this.site.isEmpty();
         }
@@ -1333,6 +1341,10 @@ public class Condition extends DomainResource {
       return (DateTimeType) this.onset;
     }
 
+    public boolean hasOnsetDateTimeType() throws Exception { 
+      return this.onset instanceof DateTimeType;
+    }
+
     /**
      * @return {@link #onset} (Estimated or actual date or date-time  the condition began, in the opinion of the clinician.)
      */
@@ -1342,6 +1354,10 @@ public class Condition extends DomainResource {
       return (Age) this.onset;
     }
 
+    public boolean hasOnsetAge() throws Exception { 
+      return this.onset instanceof Age;
+    }
+
     /**
      * @return {@link #onset} (Estimated or actual date or date-time  the condition began, in the opinion of the clinician.)
      */
@@ -1351,6 +1367,10 @@ public class Condition extends DomainResource {
       return (Period) this.onset;
     }
 
+    public boolean hasOnsetPeriod() throws Exception { 
+      return this.onset instanceof Period;
+    }
+
     /**
      * @return {@link #onset} (Estimated or actual date or date-time  the condition began, in the opinion of the clinician.)
      */
@@ -1360,6 +1380,10 @@ public class Condition extends DomainResource {
       return (Range) this.onset;
     }
 
+    public boolean hasOnsetRange() throws Exception { 
+      return this.onset instanceof Range;
+    }
+
     /**
      * @return {@link #onset} (Estimated or actual date or date-time  the condition began, in the opinion of the clinician.)
      */
@@ -1369,6 +1393,10 @@ public class Condition extends DomainResource {
       return (StringType) this.onset;
     }
 
+    public boolean hasOnsetStringType() throws Exception { 
+      return this.onset instanceof StringType;
+    }
+
     public boolean hasOnset() { 
       return this.onset != null && !this.onset.isEmpty();
     }
@@ -1397,6 +1425,10 @@ public class Condition extends DomainResource {
       return (DateType) this.abatement;
     }
 
+    public boolean hasAbatementDateType() throws Exception { 
+      return this.abatement instanceof DateType;
+    }
+
     /**
      * @return {@link #abatement} (The date or estimated date that the condition resolved or went into remission. This is called "abatement" because of the many overloaded connotations associated with "remission" or "resolution" - Conditions are never really resolved, but they can abate.)
      */
@@ -1406,6 +1438,10 @@ public class Condition extends DomainResource {
       return (Age) this.abatement;
     }
 
+    public boolean hasAbatementAge() throws Exception { 
+      return this.abatement instanceof Age;
+    }
+
     /**
      * @return {@link #abatement} (The date or estimated date that the condition resolved or went into remission. This is called "abatement" because of the many overloaded connotations associated with "remission" or "resolution" - Conditions are never really resolved, but they can abate.)
      */
@@ -1415,6 +1451,10 @@ public class Condition extends DomainResource {
       return (BooleanType) this.abatement;
     }
 
+    public boolean hasAbatementBooleanType() throws Exception { 
+      return this.abatement instanceof BooleanType;
+    }
+
     /**
      * @return {@link #abatement} (The date or estimated date that the condition resolved or went into remission. This is called "abatement" because of the many overloaded connotations associated with "remission" or "resolution" - Conditions are never really resolved, but they can abate.)
      */
@@ -1424,6 +1464,10 @@ public class Condition extends DomainResource {
       return (Period) this.abatement;
     }
 
+    public boolean hasAbatementPeriod() throws Exception { 
+      return this.abatement instanceof Period;
+    }
+
     /**
      * @return {@link #abatement} (The date or estimated date that the condition resolved or went into remission. This is called "abatement" because of the many overloaded connotations associated with "remission" or "resolution" - Conditions are never really resolved, but they can abate.)
      */
@@ -1433,6 +1477,10 @@ public class Condition extends DomainResource {
       return (Range) this.abatement;
     }
 
+    public boolean hasAbatementRange() throws Exception { 
+      return this.abatement instanceof Range;
+    }
+
     /**
      * @return {@link #abatement} (The date or estimated date that the condition resolved or went into remission. This is called "abatement" because of the many overloaded connotations associated with "remission" or "resolution" - Conditions are never really resolved, but they can abate.)
      */
@@ -1442,6 +1490,10 @@ public class Condition extends DomainResource {
       return (StringType) this.abatement;
     }
 
+    public boolean hasAbatementStringType() throws Exception { 
+      return this.abatement instanceof StringType;
+    }
+
     public boolean hasAbatement() { 
       return this.abatement != null && !this.abatement.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -78,8 +78,8 @@ public class Conformance extends DomainResource implements IBaseConformance {
         }
         public String getSystem() {
           switch (this) {
-            case CLIENT: return "http://hl7.org.fhir/restful-conformance-mode";
-            case SERVER: return "http://hl7.org.fhir/restful-conformance-mode";
+            case CLIENT: return "http://hl7.org/fhir/restful-conformance-mode";
+            case SERVER: return "http://hl7.org/fhir/restful-conformance-mode";
             default: return "?";
           }
         }
@@ -327,9 +327,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
         }
         public String getSystem() {
           switch (this) {
-            case NOVERSION: return "http://hl7.org.fhir/versioning-policy";
-            case VERSIONED: return "http://hl7.org.fhir/versioning-policy";
-            case VERSIONEDUPDATE: return "http://hl7.org.fhir/versioning-policy";
+            case NOVERSION: return "http://hl7.org/fhir/versioning-policy";
+            case VERSIONED: return "http://hl7.org/fhir/versioning-policy";
+            case VERSIONEDUPDATE: return "http://hl7.org/fhir/versioning-policy";
             default: return "?";
           }
         }
@@ -499,9 +499,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
         }
         public String getSystem() {
           switch (this) {
-            case CONSEQUENCE: return "http://hl7.org.fhir/message-significance-category";
-            case CURRENCY: return "http://hl7.org.fhir/message-significance-category";
-            case NOTIFICATION: return "http://hl7.org.fhir/message-significance-category";
+            case CONSEQUENCE: return "http://hl7.org/fhir/message-significance-category";
+            case CURRENCY: return "http://hl7.org/fhir/message-significance-category";
+            case NOTIFICATION: return "http://hl7.org/fhir/message-significance-category";
             default: return "?";
           }
         }
@@ -578,8 +578,8 @@ public class Conformance extends DomainResource implements IBaseConformance {
         }
         public String getSystem() {
           switch (this) {
-            case SENDER: return "http://hl7.org.fhir/message-conformance-event-mode";
-            case RECEIVER: return "http://hl7.org.fhir/message-conformance-event-mode";
+            case SENDER: return "http://hl7.org/fhir/message-conformance-event-mode";
+            case RECEIVER: return "http://hl7.org/fhir/message-conformance-event-mode";
             default: return "?";
           }
         }
@@ -650,8 +650,8 @@ public class Conformance extends DomainResource implements IBaseConformance {
         }
         public String getSystem() {
           switch (this) {
-            case PRODUCER: return "http://hl7.org.fhir/document-mode";
-            case CONSUMER: return "http://hl7.org.fhir/document-mode";
+            case PRODUCER: return "http://hl7.org/fhir/document-mode";
+            case CONSUMER: return "http://hl7.org/fhir/document-mode";
             default: return "?";
           }
         }
@@ -1759,7 +1759,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
          * Types of security services are supported/required by the system.
          */
         @Child(name = "service", type = {CodeableConcept.class}, order=2, min=0, max=Child.MAX_UNLIMITED)
-        @Description(shortDefinition="OAuth | OAuth2 | NTLM | Basic | Kerberos", formalDefinition="Types of security services are supported/required by the system." )
+        @Description(shortDefinition="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", formalDefinition="Types of security services are supported/required by the system." )
         protected List<CodeableConcept> service;
 
         /**
@@ -2188,14 +2188,14 @@ public class Conformance extends DomainResource implements IBaseConformance {
         protected CodeType type;
 
         /**
-         * A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations.
+         * A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses.
          */
         @Child(name = "profile", type = {StructureDefinition.class}, order=2, min=0, max=1)
-        @Description(shortDefinition="What structural features are supported", formalDefinition="A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations." )
+        @Description(shortDefinition="What structural features are supported", formalDefinition="A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses." )
         protected Reference profile;
 
         /**
-         * The actual object that is the target of the reference (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations.)
+         * The actual object that is the target of the reference (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses.)
          */
         protected StructureDefinition profileTarget;
 
@@ -2325,7 +2325,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
         }
 
         /**
-         * @return {@link #profile} (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations.)
+         * @return {@link #profile} (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses.)
          */
         public Reference getProfile() { 
           if (this.profile == null)
@@ -2341,7 +2341,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
         }
 
         /**
-         * @param value {@link #profile} (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations.)
+         * @param value {@link #profile} (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses.)
          */
         public ConformanceRestResourceComponent setProfile(Reference value) { 
           this.profile = value;
@@ -2349,7 +2349,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
         }
 
         /**
-         * @return {@link #profile} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations.)
+         * @return {@link #profile} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses.)
          */
         public StructureDefinition getProfileTarget() { 
           if (this.profileTarget == null)
@@ -2361,7 +2361,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
         }
 
         /**
-         * @param value {@link #profile} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations.)
+         * @param value {@link #profile} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses.)
          */
         public ConformanceRestResourceComponent setProfileTarget(StructureDefinition value) { 
           this.profileTarget = value;
@@ -2779,7 +2779,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
         protected void listChildren(List<Property> childrenList) {
           super.listChildren(childrenList);
           childrenList.add(new Property("type", "code", "A type of resource exposed via the restful interface.", 0, java.lang.Integer.MAX_VALUE, type));
-          childrenList.add(new Property("profile", "Reference(StructureDefinition)", "A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations.", 0, java.lang.Integer.MAX_VALUE, profile));
+          childrenList.add(new Property("profile", "Reference(StructureDefinition)", "A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations. See further discussion in [Using Profiles]{profiling.html#profile-uses.", 0, java.lang.Integer.MAX_VALUE, profile));
           childrenList.add(new Property("interaction", "", "Identifies a restful operation supported by the solution.", 0, java.lang.Integer.MAX_VALUE, interaction));
           childrenList.add(new Property("versioning", "code", "Thi field is set to true to specify that the system does not support (server) or use (client) versioning for this resource type. If this is not set to true, the server must at least correctly track and populate the versionId meta-property on resources.", 0, java.lang.Integer.MAX_VALUE, versioning));
           childrenList.add(new Property("readHistory", "boolean", "A flag for whether the server is able to return past versions as part of the vRead operation.", 0, java.lang.Integer.MAX_VALUE, readHistory));
@@ -4779,10 +4779,10 @@ public class Conformance extends DomainResource implements IBaseConformance {
   }
 
     /**
-     * An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).
+     * An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).
      */
     @Child(name = "url", type = {UriType.class}, order=0, min=0, max=1)
-    @Description(shortDefinition="Logical uri to reference this statement", formalDefinition="An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:)." )
+    @Description(shortDefinition="Logical uri to reference this statement", formalDefinition="An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:)." )
     protected UriType url;
 
     /**
@@ -4891,13 +4891,13 @@ public class Conformance extends DomainResource implements IBaseConformance {
     protected List<CodeType> format;
 
     /**
-     * A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile.
+     * A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}.
      */
     @Child(name = "profile", type = {StructureDefinition.class}, order=16, min=0, max=Child.MAX_UNLIMITED)
-    @Description(shortDefinition="Profiles supported by the system", formalDefinition="A list of profiles supported by the system. For a server, 'supported by the system' means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile." )
+    @Description(shortDefinition="Profiles supported by the system", formalDefinition="A list of profiles supported by the system. For a server, 'supported by the system' means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}." )
     protected List<Reference> profile;
     /**
-     * The actual objects that are the target of the reference (A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile.)
+     * The actual objects that are the target of the reference (A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}.)
      */
     protected List<StructureDefinition> profileTarget;
 
@@ -4943,7 +4943,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
     }
 
     /**
-     * @return {@link #url} (An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+     * @return {@link #url} (An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
      */
     public UriType getUrlElement() { 
       if (this.url == null)
@@ -4963,7 +4963,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
     }
 
     /**
-     * @param value {@link #url} (An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+     * @param value {@link #url} (An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
      */
     public Conformance setUrlElement(UriType value) { 
       this.url = value;
@@ -4971,14 +4971,14 @@ public class Conformance extends DomainResource implements IBaseConformance {
     }
 
     /**
-     * @return An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).
+     * @return An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).
      */
     public String getUrl() { 
       return this.url == null ? null : this.url.getValue();
     }
 
     /**
-     * @param value An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).
+     * @param value An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).
      */
     public Conformance setUrl(String value) { 
       if (Utilities.noString(value))
@@ -5657,7 +5657,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
     }
 
     /**
-     * @return {@link #profile} (A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile.)
+     * @return {@link #profile} (A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}.)
      */
     public List<Reference> getProfile() { 
       if (this.profile == null)
@@ -5675,7 +5675,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
     }
 
     /**
-     * @return {@link #profile} (A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile.)
+     * @return {@link #profile} (A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}.)
      */
     // syntactic sugar
     public Reference addProfile() { //3
@@ -5697,7 +5697,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
     }
 
     /**
-     * @return {@link #profile} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile.)
+     * @return {@link #profile} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}.)
      */
     public List<StructureDefinition> getProfileTarget() { 
       if (this.profileTarget == null)
@@ -5707,7 +5707,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
 
     // syntactic sugar
     /**
-     * @return {@link #profile} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile.)
+     * @return {@link #profile} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. A list of profiles supported by the system. For a server, "supported by the system" means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}.)
      */
     public StructureDefinition addProfileTarget() { 
       StructureDefinition r = new StructureDefinition();
@@ -5839,7 +5839,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
 
       protected void listChildren(List<Property> childrenList) {
         super.listChildren(childrenList);
-        childrenList.add(new Property("url", "uri", "An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).", 0, java.lang.Integer.MAX_VALUE, url));
+        childrenList.add(new Property("url", "uri", "An absolute uri that is used to identify this conformance statement when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).", 0, java.lang.Integer.MAX_VALUE, url));
         childrenList.add(new Property("version", "string", "The identifier that is used to identify this version of the conformance statement when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the profile author manually and the value should be a timestamp.", 0, java.lang.Integer.MAX_VALUE, version));
         childrenList.add(new Property("name", "string", "A free text natural language name identifying the conformance statement.", 0, java.lang.Integer.MAX_VALUE, name));
         childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the conformance.", 0, java.lang.Integer.MAX_VALUE, publisher));
@@ -5855,7 +5855,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
         childrenList.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this conformance statement is based.", 0, java.lang.Integer.MAX_VALUE, fhirVersion));
         childrenList.add(new Property("acceptUnknown", "boolean", "A flag that indicates whether the application accepts unknown elements as part of a resource.", 0, java.lang.Integer.MAX_VALUE, acceptUnknown));
         childrenList.add(new Property("format", "code", "A list of the formats supported by this implementation using their content types.", 0, java.lang.Integer.MAX_VALUE, format));
-        childrenList.add(new Property("profile", "Reference(StructureDefinition)", "A list of profiles supported by the system. For a server, 'supported by the system' means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile.", 0, java.lang.Integer.MAX_VALUE, profile));
+        childrenList.add(new Property("profile", "Reference(StructureDefinition)", "A list of profiles supported by the system. For a server, 'supported by the system' means the system hosts/produces a set of resources, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile. See further discussion in [Using Profiles]{profiling.html#profile-uses}.", 0, java.lang.Integer.MAX_VALUE, profile));
         childrenList.add(new Property("rest", "", "A definition of the restful capabilities of the solution, if any.", 0, java.lang.Integer.MAX_VALUE, rest));
         childrenList.add(new Property("messaging", "", "A description of the messaging capabilities of the solution.", 0, java.lang.Integer.MAX_VALUE, messaging));
         childrenList.add(new Property("document", "", "A document definition.", 0, java.lang.Integer.MAX_VALUE, document));

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java

@@ -29,12 +29,12 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 
 public class Constants {
 
   public final static String VERSION = "0.5.0";
-  public final static String REVISION = "5320";
-  public final static String DATE = "Sun May 31 15:45:19 EDT 2015";
+  public final static String REVISION = "5780";
+  public final static String DATE = "Wed Jul 08 17:35:37 EDT 2015";
 }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -90,10 +90,10 @@ public class ContactPoint extends Type implements ICompositeType {
         }
         public String getSystem() {
           switch (this) {
-            case PHONE: return "http://hl7.org.fhir/contact-point-system";
-            case FAX: return "http://hl7.org.fhir/contact-point-system";
-            case EMAIL: return "http://hl7.org.fhir/contact-point-system";
-            case URL: return "http://hl7.org.fhir/contact-point-system";
+            case PHONE: return "http://hl7.org/fhir/contact-point-system";
+            case FAX: return "http://hl7.org/fhir/contact-point-system";
+            case EMAIL: return "http://hl7.org/fhir/contact-point-system";
+            case URL: return "http://hl7.org/fhir/contact-point-system";
             default: return "?";
           }
         }
@@ -197,11 +197,11 @@ public class ContactPoint extends Type implements ICompositeType {
         }
         public String getSystem() {
           switch (this) {
-            case HOME: return "http://hl7.org.fhir/contact-point-use";
-            case WORK: return "http://hl7.org.fhir/contact-point-use";
-            case TEMP: return "http://hl7.org.fhir/contact-point-use";
-            case OLD: return "http://hl7.org.fhir/contact-point-use";
-            case MOBILE: return "http://hl7.org.fhir/contact-point-use";
+            case HOME: return "http://hl7.org/fhir/contact-point-use";
+            case WORK: return "http://hl7.org/fhir/contact-point-use";
+            case TEMP: return "http://hl7.org/fhir/contact-point-use";
+            case OLD: return "http://hl7.org/fhir/contact-point-use";
+            case MOBILE: return "http://hl7.org/fhir/contact-point-use";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -292,6 +292,10 @@ public class Contract extends DomainResource {
           return (CodeableConcept) this.entity;
         }
 
+        public boolean hasEntityCodeableConcept() throws Exception { 
+          return this.entity instanceof CodeableConcept;
+        }
+
         /**
          * @return {@link #entity} (Specific type of Contract Valued Item that may be priced.)
          */
@@ -301,6 +305,10 @@ public class Contract extends DomainResource {
           return (Reference) this.entity;
         }
 
+        public boolean hasEntityReference() throws Exception { 
+          return this.entity instanceof Reference;
+        }
+
         public boolean hasEntity() { 
           return this.entity != null && !this.entity.isEmpty();
         }
@@ -1679,6 +1687,10 @@ public class Contract extends DomainResource {
           return (CodeableConcept) this.entity;
         }
 
+        public boolean hasEntityCodeableConcept() throws Exception { 
+          return this.entity instanceof CodeableConcept;
+        }
+
         /**
          * @return {@link #entity} (Specific type of Contract Provision Valued Item that may be priced.)
          */
@@ -1688,6 +1700,10 @@ public class Contract extends DomainResource {
           return (Reference) this.entity;
         }
 
+        public boolean hasEntityReference() throws Exception { 
+          return this.entity instanceof Reference;
+        }
+
         public boolean hasEntity() { 
           return this.entity != null && !this.entity.isEmpty();
         }
@@ -2043,6 +2059,10 @@ public class Contract extends DomainResource {
           return (Attachment) this.content;
         }
 
+        public boolean hasContentAttachment() throws Exception { 
+          return this.content instanceof Attachment;
+        }
+
         /**
          * @return {@link #content} (Human readable rendering of this Contract in a format and representation intended to enhance comprehension and ensure understandability.)
          */
@@ -2052,6 +2072,10 @@ public class Contract extends DomainResource {
           return (Reference) this.content;
         }
 
+        public boolean hasContentReference() throws Exception { 
+          return this.content instanceof Reference;
+        }
+
         public boolean hasContent() { 
           return this.content != null && !this.content.isEmpty();
         }
@@ -2144,6 +2168,10 @@ public class Contract extends DomainResource {
           return (Attachment) this.content;
         }
 
+        public boolean hasContentAttachment() throws Exception { 
+          return this.content instanceof Attachment;
+        }
+
         /**
          * @return {@link #content} (Contract legal text in human renderable form.)
          */
@@ -2153,6 +2181,10 @@ public class Contract extends DomainResource {
           return (Reference) this.content;
         }
 
+        public boolean hasContentReference() throws Exception { 
+          return this.content instanceof Reference;
+        }
+
         public boolean hasContent() { 
           return this.content != null && !this.content.isEmpty();
         }
@@ -2245,6 +2277,10 @@ public class Contract extends DomainResource {
           return (Attachment) this.content;
         }
 
+        public boolean hasContentAttachment() throws Exception { 
+          return this.content instanceof Attachment;
+        }
+
         /**
          * @return {@link #content} (Computable Contract conveyed using a policy rule language (e.g. XACML, DKAL, SecPal).)
          */
@@ -2254,6 +2290,10 @@ public class Contract extends DomainResource {
           return (Reference) this.content;
         }
 
+        public boolean hasContentReference() throws Exception { 
+          return this.content instanceof Reference;
+        }
+
         public boolean hasContent() { 
           return this.content != null && !this.content.isEmpty();
         }
@@ -3042,6 +3082,10 @@ public class Contract extends DomainResource {
       return (Attachment) this.binding;
     }
 
+    public boolean hasBindingAttachment() throws Exception { 
+      return this.binding instanceof Attachment;
+    }
+
     /**
      * @return {@link #binding} (Legally binding Contract: This is the signed and legally recognized representation of the Contract, which is considered the "source of truth" and which would be the basis for legal action related to enforcement of this Contract.)
      */
@@ -3051,6 +3095,10 @@ public class Contract extends DomainResource {
       return (Reference) this.binding;
     }
 
+    public boolean hasBindingReference() throws Exception { 
+      return this.binding instanceof Reference;
+    }
+
     public boolean hasBinding() { 
       return this.binding != null && !this.binding.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -46,6 +46,92 @@ import org.hl7.fhir.instance.model.api.*;
 @ResourceDef(name="Contraindication", profile="http://hl7.org/fhir/Profile/Contraindication")
 public class Contraindication extends DomainResource {
 
+    public enum ContraindicationSeverity {
+        /**
+         * null
+         */
+        HIGH, 
+        /**
+         * null
+         */
+        MODERATE, 
+        /**
+         * null
+         */
+        LOW, 
+        /**
+         * added to help the parsers
+         */
+        NULL;
+        public static ContraindicationSeverity fromCode(String codeString) throws Exception {
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("high".equals(codeString))
+          return HIGH;
+        if ("moderate".equals(codeString))
+          return MODERATE;
+        if ("low".equals(codeString))
+          return LOW;
+        throw new Exception("Unknown ContraindicationSeverity code '"+codeString+"'");
+        }
+        public String toCode() {
+          switch (this) {
+            case HIGH: return "high";
+            case MODERATE: return "moderate";
+            case LOW: return "low";
+            default: return "?";
+          }
+        }
+        public String getSystem() {
+          switch (this) {
+            case HIGH: return "High";
+            case MODERATE: return "Moderate";
+            case LOW: return "Low";
+            default: return "?";
+          }
+        }
+        public String getDefinition() {
+          switch (this) {
+            case HIGH: return "";
+            case MODERATE: return "";
+            case LOW: return "";
+            default: return "?";
+          }
+        }
+        public String getDisplay() {
+          switch (this) {
+            case HIGH: return "high";
+            case MODERATE: return "moderate";
+            case LOW: return "low";
+            default: return "?";
+          }
+        }
+    }
+
+  public static class ContraindicationSeverityEnumFactory implements EnumFactory<ContraindicationSeverity> {
+    public ContraindicationSeverity fromCode(String codeString) throws IllegalArgumentException {
+      if (codeString == null || "".equals(codeString))
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("high".equals(codeString))
+          return ContraindicationSeverity.HIGH;
+        if ("moderate".equals(codeString))
+          return ContraindicationSeverity.MODERATE;
+        if ("low".equals(codeString))
+          return ContraindicationSeverity.LOW;
+        throw new IllegalArgumentException("Unknown ContraindicationSeverity code '"+codeString+"'");
+        }
+    public String toCode(ContraindicationSeverity code) {
+      if (code == ContraindicationSeverity.HIGH)
+        return "high";
+      if (code == ContraindicationSeverity.MODERATE)
+        return "moderate";
+      if (code == ContraindicationSeverity.LOW)
+        return "low";
+      return "?";
+      }
+    }
+
     @Block()
     public static class ContraindicationMitigationComponent extends BackboneElement implements IBaseBackboneElement {
         /**
@@ -275,8 +361,8 @@ public class Contraindication extends DomainResource {
      * Indicates the degree of importance associated with the identified issue based on the potential impact on the patient.
      */
     @Child(name = "severity", type = {CodeType.class}, order=2, min=0, max=1)
-    @Description(shortDefinition="high | medium | low", formalDefinition="Indicates the degree of importance associated with the identified issue based on the potential impact on the patient." )
-    protected CodeType severity;
+    @Description(shortDefinition="high | moderate | low", formalDefinition="Indicates the degree of importance associated with the identified issue based on the potential impact on the patient." )
+    protected Enumeration<ContraindicationSeverity> severity;
 
     /**
      * Indicates the resource representing the current activity or proposed activity that.
@@ -331,13 +417,13 @@ public class Contraindication extends DomainResource {
     protected UriType reference;
 
     /**
-     * Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindicaiton from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.
+     * Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.
      */
     @Child(name = "mitigation", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED)
-    @Description(shortDefinition="Step taken to address", formalDefinition="Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindicaiton from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action." )
+    @Description(shortDefinition="Step taken to address", formalDefinition="Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action." )
     protected List<ContraindicationMitigationComponent> mitigation;
 
-    private static final long serialVersionUID = 528603336L;
+    private static final long serialVersionUID = -1915322652L;
 
   /*
    * Constructor
@@ -417,12 +503,12 @@ public class Contraindication extends DomainResource {
     /**
      * @return {@link #severity} (Indicates the degree of importance associated with the identified issue based on the potential impact on the patient.). This is the underlying object with id, value and extensions. The accessor "getSeverity" gives direct access to the value
      */
-    public CodeType getSeverityElement() { 
+    public Enumeration<ContraindicationSeverity> getSeverityElement() { 
       if (this.severity == null)
         if (Configuration.errorOnAutoCreate())
           throw new Error("Attempt to auto-create Contraindication.severity");
         else if (Configuration.doAutoCreate())
-          this.severity = new CodeType(); // bb
+          this.severity = new Enumeration<ContraindicationSeverity>(new ContraindicationSeverityEnumFactory()); // bb
       return this.severity;
     }
 
@@ -437,7 +523,7 @@ public class Contraindication extends DomainResource {
     /**
      * @param value {@link #severity} (Indicates the degree of importance associated with the identified issue based on the potential impact on the patient.). This is the underlying object with id, value and extensions. The accessor "getSeverity" gives direct access to the value
      */
-    public Contraindication setSeverityElement(CodeType value) { 
+    public Contraindication setSeverityElement(Enumeration<ContraindicationSeverity> value) { 
       this.severity = value;
       return this;
     }
@@ -445,19 +531,19 @@ public class Contraindication extends DomainResource {
     /**
      * @return Indicates the degree of importance associated with the identified issue based on the potential impact on the patient.
      */
-    public String getSeverity() { 
+    public ContraindicationSeverity getSeverity() { 
       return this.severity == null ? null : this.severity.getValue();
     }
 
     /**
      * @param value Indicates the degree of importance associated with the identified issue based on the potential impact on the patient.
      */
-    public Contraindication setSeverity(String value) { 
-      if (Utilities.noString(value))
+    public Contraindication setSeverity(ContraindicationSeverity value) { 
+      if (value == null)
         this.severity = null;
       else {
         if (this.severity == null)
-          this.severity = new CodeType();
+          this.severity = new Enumeration<ContraindicationSeverity>(new ContraindicationSeverityEnumFactory());
         this.severity.setValue(value);
       }
       return this;
@@ -723,7 +809,7 @@ public class Contraindication extends DomainResource {
     }
 
     /**
-     * @return {@link #mitigation} (Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindicaiton from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.)
+     * @return {@link #mitigation} (Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.)
      */
     public List<ContraindicationMitigationComponent> getMitigation() { 
       if (this.mitigation == null)
@@ -741,7 +827,7 @@ public class Contraindication extends DomainResource {
     }
 
     /**
-     * @return {@link #mitigation} (Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindicaiton from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.)
+     * @return {@link #mitigation} (Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.)
      */
     // syntactic sugar
     public ContraindicationMitigationComponent addMitigation() { //3
@@ -773,7 +859,7 @@ public class Contraindication extends DomainResource {
         childrenList.add(new Property("author", "Reference(Practitioner|Device)", "Identifies the provider or software that identified the.", 0, java.lang.Integer.MAX_VALUE, author));
         childrenList.add(new Property("identifier", "Identifier", "Business identifier associated with the contraindication record.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("reference", "uri", "The literature, knowledge-base or similar reference that describes the propensity for the contraindication identified.", 0, java.lang.Integer.MAX_VALUE, reference));
-        childrenList.add(new Property("mitigation", "", "Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindicaiton from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.", 0, java.lang.Integer.MAX_VALUE, mitigation));
+        childrenList.add(new Property("mitigation", "", "Indicates an action that has been taken or is committed to to reduce or eliminate the likelihood of the risk identified by the contraindication from manifesting.  Can also reflect an observation of known mitigating factors that may reduce/eliminate the need for any action.", 0, java.lang.Integer.MAX_VALUE, mitigation));
       }
 
       public Contraindication copy() {

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import org.hl7.fhir.instance.model.annotations.DatatypeDef;
 import org.hl7.fhir.instance.model.annotations.Block;

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -106,12 +106,12 @@ public class DataElement extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case COMPARABLE: return "http://hl7.org.fhir/dataelement-specificity";
-            case FULLYSPECIFIED: return "http://hl7.org.fhir/dataelement-specificity";
-            case EQUIVALENT: return "http://hl7.org.fhir/dataelement-specificity";
-            case CONVERTABLE: return "http://hl7.org.fhir/dataelement-specificity";
-            case SCALEABLE: return "http://hl7.org.fhir/dataelement-specificity";
-            case FLEXIBLE: return "http://hl7.org.fhir/dataelement-specificity";
+            case COMPARABLE: return "http://hl7.org/fhir/dataelement-specificity";
+            case FULLYSPECIFIED: return "http://hl7.org/fhir/dataelement-specificity";
+            case EQUIVALENT: return "http://hl7.org/fhir/dataelement-specificity";
+            case CONVERTABLE: return "http://hl7.org/fhir/dataelement-specificity";
+            case SCALEABLE: return "http://hl7.org/fhir/dataelement-specificity";
+            case FLEXIBLE: return "http://hl7.org/fhir/dataelement-specificity";
             default: return "?";
           }
         }
@@ -621,10 +621,10 @@ public class DataElement extends DomainResource {
   }
 
     /**
-     * An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).
+     * An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).
      */
     @Child(name = "url", type = {UriType.class}, order=0, min=0, max=1)
-    @Description(shortDefinition="Globally unique logical id for data element", formalDefinition="An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:)." )
+    @Description(shortDefinition="Globally unique logical id for data element", formalDefinition="An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:)." )
     protected UriType url;
 
     /**
@@ -736,7 +736,7 @@ public class DataElement extends DomainResource {
     }
 
     /**
-     * @return {@link #url} (An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+     * @return {@link #url} (An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
      */
     public UriType getUrlElement() { 
       if (this.url == null)
@@ -756,7 +756,7 @@ public class DataElement extends DomainResource {
     }
 
     /**
-     * @param value {@link #url} (An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+     * @param value {@link #url} (An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
      */
     public DataElement setUrlElement(UriType value) { 
       this.url = value;
@@ -764,14 +764,14 @@ public class DataElement extends DomainResource {
     }
 
     /**
-     * @return An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).
+     * @return An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).
      */
     public String getUrl() { 
       return this.url == null ? null : this.url.getValue();
     }
 
     /**
-     * @param value An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).
+     * @param value An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).
      */
     public DataElement setUrl(String value) { 
       if (Utilities.noString(value))
@@ -1354,7 +1354,7 @@ public class DataElement extends DomainResource {
 
       protected void listChildren(List<Property> childrenList) {
         super.listChildren(childrenList);
-        childrenList.add(new Property("url", "uri", "An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and an be urn:uuid: or urn:oid:).", 0, java.lang.Integer.MAX_VALUE, url));
+        childrenList.add(new Property("url", "uri", "An absolute uri that is used to identify this element when it is referenced in a specification, model, design or an instance (should be globally unique URI, and can be urn:uuid: or urn:oid:).", 0, java.lang.Integer.MAX_VALUE, url));
         childrenList.add(new Property("identifier", "Identifier", "Formal identifier that is used to identify this data element when it is represented in other formats, or referenced in a specification, model, design or an instance.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("version", "string", "The identifier that is used to identify this version of the data element when it is referenced in a StructureDefinition, Questionnaire or instance. This is an arbitrary value managed by the definition author manually.", 0, java.lang.Integer.MAX_VALUE, version));
         childrenList.add(new Property("name", "string", "The term used by humans to refer to the data element.  Should ideally be unique within the context in which the data element is expected to be used.", 0, java.lang.Integer.MAX_VALUE, name));

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -84,9 +84,9 @@ public class Device extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case AVAILABLE: return "http://hl7.org.fhir/devicestatus";
-            case NOTAVAILABLE: return "http://hl7.org.fhir/devicestatus";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/devicestatus";
+            case AVAILABLE: return "http://hl7.org/fhir/devicestatus";
+            case NOTAVAILABLE: return "http://hl7.org/fhir/devicestatus";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/devicestatus";
             default: return "?";
           }
         }
@@ -146,66 +146,73 @@ public class Device extends DomainResource {
     @Description(shortDefinition="What kind of device this is", formalDefinition="Code or identifier to identify a kind of device." )
     protected CodeableConcept type;
 
+    /**
+     * Descriptive information, usage information or implantation information that is not captured in an existing element.
+     */
+    @Child(name = "note", type = {Annotation.class}, order=2, min=0, max=Child.MAX_UNLIMITED)
+    @Description(shortDefinition="Device notes and comments", formalDefinition="Descriptive information, usage information or implantation information that is not captured in an existing element." )
+    protected List<Annotation> note;
+
     /**
      * Status of the Device availability.
      */
-    @Child(name = "status", type = {CodeType.class}, order=2, min=0, max=1)
+    @Child(name = "status", type = {CodeType.class}, order=3, min=0, max=1)
     @Description(shortDefinition="available | not-available | entered-in-error", formalDefinition="Status of the Device availability." )
     protected Enumeration<DeviceStatus> status;
 
     /**
      * A name of the manufacturer.
      */
-    @Child(name = "manufacturer", type = {StringType.class}, order=3, min=0, max=1)
+    @Child(name = "manufacturer", type = {StringType.class}, order=4, min=0, max=1)
     @Description(shortDefinition="Name of device manufacturer", formalDefinition="A name of the manufacturer." )
     protected StringType manufacturer;
 
     /**
      * The "model" - an identifier assigned by the manufacturer to identify the product by its type. This number is shared by the all devices sold as the same type.
      */
-    @Child(name = "model", type = {StringType.class}, order=4, min=0, max=1)
+    @Child(name = "model", type = {StringType.class}, order=5, min=0, max=1)
     @Description(shortDefinition="Model id assigned by the manufacturer", formalDefinition="The 'model' - an identifier assigned by the manufacturer to identify the product by its type. This number is shared by the all devices sold as the same type." )
     protected StringType model;
 
     /**
      * The version of the device, if the device has multiple releases under the same model, or if the device is software or carries firmware.
      */
-    @Child(name = "version", type = {StringType.class}, order=5, min=0, max=1)
+    @Child(name = "version", type = {StringType.class}, order=6, min=0, max=1)
     @Description(shortDefinition="Version number (i.e. software)", formalDefinition="The version of the device, if the device has multiple releases under the same model, or if the device is software or carries firmware." )
     protected StringType version;
 
     /**
      * The Date and time when the device was manufactured.
      */
-    @Child(name = "manufactureDate", type = {DateTimeType.class}, order=6, min=0, max=1)
+    @Child(name = "manufactureDate", type = {DateTimeType.class}, order=7, min=0, max=1)
     @Description(shortDefinition="Manufacture date", formalDefinition="The Date and time when the device was manufactured." )
     protected DateTimeType manufactureDate;
 
     /**
      * The date and time beyond which this device is no longer valid or should not be used (if applicable).
      */
-    @Child(name = "expiry", type = {DateTimeType.class}, order=7, min=0, max=1)
+    @Child(name = "expiry", type = {DateTimeType.class}, order=8, min=0, max=1)
     @Description(shortDefinition="Date and time of expiry of this device (if applicable)", formalDefinition="The date and time beyond which this device is no longer valid or should not be used (if applicable)." )
     protected DateTimeType expiry;
 
     /**
      * United States Food and Drug Administration mandated Unique Device Identifier (UDI). Use the human readable information (the content that the user sees, which is sometimes different to the exact syntax represented in the barcode)  - see http://www.fda.gov/MedicalDevices/DeviceRegulationandGuidance/UniqueDeviceIdentification/default.htm.
      */
-    @Child(name = "udi", type = {StringType.class}, order=8, min=0, max=1)
+    @Child(name = "udi", type = {StringType.class}, order=9, min=0, max=1)
     @Description(shortDefinition="FDA Mandated Unique Device Identifier", formalDefinition="United States Food and Drug Administration mandated Unique Device Identifier (UDI). Use the human readable information (the content that the user sees, which is sometimes different to the exact syntax represented in the barcode)  - see http://www.fda.gov/MedicalDevices/DeviceRegulationandGuidance/UniqueDeviceIdentification/default.htm." )
     protected StringType udi;
 
     /**
      * Lot number assigned by the manufacturer.
      */
-    @Child(name = "lotNumber", type = {StringType.class}, order=9, min=0, max=1)
+    @Child(name = "lotNumber", type = {StringType.class}, order=10, min=0, max=1)
     @Description(shortDefinition="Lot number of manufacture", formalDefinition="Lot number assigned by the manufacturer." )
     protected StringType lotNumber;
 
     /**
      * An organization that is responsible for the provision and ongoing maintenance of the device.
      */
-    @Child(name = "owner", type = {Organization.class}, order=10, min=0, max=1)
+    @Child(name = "owner", type = {Organization.class}, order=11, min=0, max=1)
     @Description(shortDefinition="Organization responsible for device", formalDefinition="An organization that is responsible for the provision and ongoing maintenance of the device." )
     protected Reference owner;
 
@@ -217,7 +224,7 @@ public class Device extends DomainResource {
     /**
      * The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. "in/with the patient"), or a coded location.
      */
-    @Child(name = "location", type = {Location.class}, order=11, min=0, max=1)
+    @Child(name = "location", type = {Location.class}, order=12, min=0, max=1)
     @Description(shortDefinition="Where the resource is found", formalDefinition="The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. 'in/with the patient'), or a coded location." )
     protected Reference location;
 
@@ -229,7 +236,7 @@ public class Device extends DomainResource {
     /**
      * Patient information, if the resource is affixed to a person.
      */
-    @Child(name = "patient", type = {Patient.class}, order=12, min=0, max=1)
+    @Child(name = "patient", type = {Patient.class}, order=13, min=0, max=1)
     @Description(shortDefinition="If the resource is affixed to a person", formalDefinition="Patient information, if the resource is affixed to a person." )
     protected Reference patient;
 
@@ -241,18 +248,18 @@ public class Device extends DomainResource {
     /**
      * Contact details for an organization or a particular human that is responsible for the device.
      */
-    @Child(name = "contact", type = {ContactPoint.class}, order=13, min=0, max=Child.MAX_UNLIMITED)
+    @Child(name = "contact", type = {ContactPoint.class}, order=14, min=0, max=Child.MAX_UNLIMITED)
     @Description(shortDefinition="Details for human/organization for support", formalDefinition="Contact details for an organization or a particular human that is responsible for the device." )
     protected List<ContactPoint> contact;
 
     /**
      * A network address on which the device may be contacted directly.
      */
-    @Child(name = "url", type = {UriType.class}, order=14, min=0, max=1)
+    @Child(name = "url", type = {UriType.class}, order=15, min=0, max=1)
     @Description(shortDefinition="Network address to contact device", formalDefinition="A network address on which the device may be contacted directly." )
     protected UriType url;
 
-    private static final long serialVersionUID = -612440681L;
+    private static final long serialVersionUID = 366690094L;
 
   /*
    * Constructor
@@ -333,6 +340,46 @@ public class Device extends DomainResource {
       return this;
     }
 
+    /**
+     * @return {@link #note} (Descriptive information, usage information or implantation information that is not captured in an existing element.)
+     */
+    public List<Annotation> getNote() { 
+      if (this.note == null)
+        this.note = new ArrayList<Annotation>();
+      return this.note;
+    }
+
+    public boolean hasNote() { 
+      if (this.note == null)
+        return false;
+      for (Annotation item : this.note)
+        if (!item.isEmpty())
+          return true;
+      return false;
+    }
+
+    /**
+     * @return {@link #note} (Descriptive information, usage information or implantation information that is not captured in an existing element.)
+     */
+    // syntactic sugar
+    public Annotation addNote() { //3
+      Annotation t = new Annotation();
+      if (this.note == null)
+        this.note = new ArrayList<Annotation>();
+      this.note.add(t);
+      return t;
+    }
+
+    // syntactic sugar
+    public Device addNote(Annotation t) { //3
+      if (t == null)
+        return this;
+      if (this.note == null)
+        this.note = new ArrayList<Annotation>();
+      this.note.add(t);
+      return this;
+    }
+
     /**
      * @return {@link #status} (Status of the Device availability.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
      */
@@ -950,6 +997,7 @@ public class Device extends DomainResource {
         super.listChildren(childrenList);
         childrenList.add(new Property("identifier", "Identifier", "Unique instance identifiers assigned to a device by organizations like manufacturers or owners .   If the identifier identifies the type of device, Device.type should be used.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("type", "CodeableConcept", "Code or identifier to identify a kind of device.", 0, java.lang.Integer.MAX_VALUE, type));
+        childrenList.add(new Property("note", "Annotation", "Descriptive information, usage information or implantation information that is not captured in an existing element.", 0, java.lang.Integer.MAX_VALUE, note));
         childrenList.add(new Property("status", "code", "Status of the Device availability.", 0, java.lang.Integer.MAX_VALUE, status));
         childrenList.add(new Property("manufacturer", "string", "A name of the manufacturer.", 0, java.lang.Integer.MAX_VALUE, manufacturer));
         childrenList.add(new Property("model", "string", "The 'model' - an identifier assigned by the manufacturer to identify the product by its type. This number is shared by the all devices sold as the same type.", 0, java.lang.Integer.MAX_VALUE, model));
@@ -974,6 +1022,11 @@ public class Device extends DomainResource {
             dst.identifier.add(i.copy());
         };
         dst.type = type == null ? null : type.copy();
+        if (note != null) {
+          dst.note = new ArrayList<Annotation>();
+          for (Annotation i : note)
+            dst.note.add(i.copy());
+        };
         dst.status = status == null ? null : status.copy();
         dst.manufacturer = manufacturer == null ? null : manufacturer.copy();
         dst.model = model == null ? null : model.copy();
@@ -1005,12 +1058,12 @@ public class Device extends DomainResource {
         if (!(other instanceof Device))
           return false;
         Device o = (Device) other;
-        return compareDeep(identifier, o.identifier, true) && compareDeep(type, o.type, true) && compareDeep(status, o.status, true)
-           && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(model, o.model, true) && compareDeep(version, o.version, true)
-           && compareDeep(manufactureDate, o.manufactureDate, true) && compareDeep(expiry, o.expiry, true)
-           && compareDeep(udi, o.udi, true) && compareDeep(lotNumber, o.lotNumber, true) && compareDeep(owner, o.owner, true)
-           && compareDeep(location, o.location, true) && compareDeep(patient, o.patient, true) && compareDeep(contact, o.contact, true)
-           && compareDeep(url, o.url, true);
+        return compareDeep(identifier, o.identifier, true) && compareDeep(type, o.type, true) && compareDeep(note, o.note, true)
+           && compareDeep(status, o.status, true) && compareDeep(manufacturer, o.manufacturer, true) && compareDeep(model, o.model, true)
+           && compareDeep(version, o.version, true) && compareDeep(manufactureDate, o.manufactureDate, true)
+           && compareDeep(expiry, o.expiry, true) && compareDeep(udi, o.udi, true) && compareDeep(lotNumber, o.lotNumber, true)
+           && compareDeep(owner, o.owner, true) && compareDeep(location, o.location, true) && compareDeep(patient, o.patient, true)
+           && compareDeep(contact, o.contact, true) && compareDeep(url, o.url, true);
       }
 
       @Override
@@ -1028,7 +1081,7 @@ public class Device extends DomainResource {
 
       public boolean isEmpty() {
         return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (type == null || type.isEmpty())
-           && (status == null || status.isEmpty()) && (manufacturer == null || manufacturer.isEmpty())
+           && (note == null || note.isEmpty()) && (status == null || status.isEmpty()) && (manufacturer == null || manufacturer.isEmpty())
            && (model == null || model.isEmpty()) && (version == null || version.isEmpty()) && (manufactureDate == null || manufactureDate.isEmpty())
            && (expiry == null || expiry.isEmpty()) && (udi == null || udi.isEmpty()) && (lotNumber == null || lotNumber.isEmpty())
            && (owner == null || owner.isEmpty()) && (location == null || location.isEmpty()) && (patient == null || patient.isEmpty())

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -140,17 +140,17 @@ public class DeviceComponent extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case OTHER: return "http://hl7.org.fhir/measurement-principle";
-            case CHEMICAL: return "http://hl7.org.fhir/measurement-principle";
-            case ELECTRICAL: return "http://hl7.org.fhir/measurement-principle";
-            case IMPEDANCE: return "http://hl7.org.fhir/measurement-principle";
-            case NUCLEAR: return "http://hl7.org.fhir/measurement-principle";
-            case OPTICAL: return "http://hl7.org.fhir/measurement-principle";
-            case THERMAL: return "http://hl7.org.fhir/measurement-principle";
-            case BIOLOGICAL: return "http://hl7.org.fhir/measurement-principle";
-            case MECHANICAL: return "http://hl7.org.fhir/measurement-principle";
-            case ACOUSTICAL: return "http://hl7.org.fhir/measurement-principle";
-            case MANUAL: return "http://hl7.org.fhir/measurement-principle";
+            case OTHER: return "http://hl7.org/fhir/measurement-principle";
+            case CHEMICAL: return "http://hl7.org/fhir/measurement-principle";
+            case ELECTRICAL: return "http://hl7.org/fhir/measurement-principle";
+            case IMPEDANCE: return "http://hl7.org/fhir/measurement-principle";
+            case NUCLEAR: return "http://hl7.org/fhir/measurement-principle";
+            case OPTICAL: return "http://hl7.org/fhir/measurement-principle";
+            case THERMAL: return "http://hl7.org/fhir/measurement-principle";
+            case BIOLOGICAL: return "http://hl7.org/fhir/measurement-principle";
+            case MECHANICAL: return "http://hl7.org/fhir/measurement-principle";
+            case ACOUSTICAL: return "http://hl7.org/fhir/measurement-principle";
+            case MANUAL: return "http://hl7.org/fhir/measurement-principle";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -84,9 +84,9 @@ public class DeviceMetric extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case ON: return "http://hl7.org.fhir/metric-operational-status";
-            case OFF: return "http://hl7.org.fhir/metric-operational-status";
-            case STANDBY: return "http://hl7.org.fhir/metric-operational-status";
+            case ON: return "http://hl7.org/fhir/metric-operational-status";
+            case OFF: return "http://hl7.org/fhir/metric-operational-status";
+            case STANDBY: return "http://hl7.org/fhir/metric-operational-status";
             default: return "?";
           }
         }
@@ -205,14 +205,14 @@ public class DeviceMetric extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case BLACK: return "http://hl7.org.fhir/metric-color";
-            case RED: return "http://hl7.org.fhir/metric-color";
-            case GREEN: return "http://hl7.org.fhir/metric-color";
-            case YELLOW: return "http://hl7.org.fhir/metric-color";
-            case BLUE: return "http://hl7.org.fhir/metric-color";
-            case MAGENTA: return "http://hl7.org.fhir/metric-color";
-            case CYAN: return "http://hl7.org.fhir/metric-color";
-            case WHITE: return "http://hl7.org.fhir/metric-color";
+            case BLACK: return "http://hl7.org/fhir/metric-color";
+            case RED: return "http://hl7.org/fhir/metric-color";
+            case GREEN: return "http://hl7.org/fhir/metric-color";
+            case YELLOW: return "http://hl7.org/fhir/metric-color";
+            case BLUE: return "http://hl7.org/fhir/metric-color";
+            case MAGENTA: return "http://hl7.org/fhir/metric-color";
+            case CYAN: return "http://hl7.org/fhir/metric-color";
+            case WHITE: return "http://hl7.org/fhir/metric-color";
             default: return "?";
           }
         }
@@ -333,10 +333,10 @@ public class DeviceMetric extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case MEASUREMENT: return "http://hl7.org.fhir/metric-category";
-            case SETTING: return "http://hl7.org.fhir/metric-category";
-            case CALCULATION: return "http://hl7.org.fhir/metric-category";
-            case UNSPECIFIED: return "http://hl7.org.fhir/metric-category";
+            case MEASUREMENT: return "http://hl7.org/fhir/metric-category";
+            case SETTING: return "http://hl7.org/fhir/metric-category";
+            case CALCULATION: return "http://hl7.org/fhir/metric-category";
+            case UNSPECIFIED: return "http://hl7.org/fhir/metric-category";
             default: return "?";
           }
         }
@@ -433,10 +433,10 @@ public class DeviceMetric extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case UNSPECIFIED: return "http://hl7.org.fhir/metric-calibration-type";
-            case OFFSET: return "http://hl7.org.fhir/metric-calibration-type";
-            case GAIN: return "http://hl7.org.fhir/metric-calibration-type";
-            case TWOPOINT: return "http://hl7.org.fhir/metric-calibration-type";
+            case UNSPECIFIED: return "http://hl7.org/fhir/metric-calibration-type";
+            case OFFSET: return "http://hl7.org/fhir/metric-calibration-type";
+            case GAIN: return "http://hl7.org/fhir/metric-calibration-type";
+            case TWOPOINT: return "http://hl7.org/fhir/metric-calibration-type";
             default: return "?";
           }
         }
@@ -533,10 +533,10 @@ public class DeviceMetric extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case NOTCALIBRATED: return "http://hl7.org.fhir/metric-calibration-state";
-            case CALIBRATIONREQUIRED: return "http://hl7.org.fhir/metric-calibration-state";
-            case CALIBRATED: return "http://hl7.org.fhir/metric-calibration-state";
-            case UNSPECIFIED: return "http://hl7.org.fhir/metric-calibration-state";
+            case NOTCALIBRATED: return "http://hl7.org/fhir/metric-calibration-state";
+            case CALIBRATIONREQUIRED: return "http://hl7.org/fhir/metric-calibration-state";
+            case CALIBRATED: return "http://hl7.org/fhir/metric-calibration-state";
+            case UNSPECIFIED: return "http://hl7.org/fhir/metric-calibration-state";
             default: return "?";
           }
         }
@@ -868,10 +868,10 @@ An example would be a DeviceComponent that represents a Channel. This reference
     protected Enumeration<DeviceMetricOperationalStatus> operationalStatus;
 
     /**
-     * Describes the typical color of the representation of observations that have been generated for this DeviceMetric.
+     * Describes the color representation for the metric. This is often used to aid clinicians to track and identify parameter types by color. In practice, consider a Patient Monitor that has ECG/HR and Pleth for example; the parameters are displayed in different characteristic colors, such as HR-blue, BP-green, and PR and SpO2- magenta.
      */
     @Child(name = "color", type = {CodeType.class}, order=6, min=0, max=1)
-    @Description(shortDefinition="black | red | green | yellow | blue | magenta | cyan | white", formalDefinition="Describes the typical color of the representation of observations that have been generated for this DeviceMetric." )
+    @Description(shortDefinition="black | red | green | yellow | blue | magenta | cyan | white", formalDefinition="Describes the color representation for the metric. This is often used to aid clinicians to track and identify parameter types by color. In practice, consider a Patient Monitor that has ECG/HR and Pleth for example; the parameters are displayed in different characteristic colors, such as HR-blue, BP-green, and PR and SpO2- magenta." )
     protected Enumeration<DeviceMetricColor> color;
 
     /**
@@ -882,12 +882,12 @@ An example would be a DeviceComponent that represents a Channel. This reference
     protected Enumeration<DeviceMetricCategory> category;
 
     /**
-     * Describes the measurement repetition time. This is not
-necessarily the same as the update
-period.
+     * Describes the measurement repetition time. This is not necessarily the same as the update period.
+The measurement repetition time can range from milliseconds up to hours. An example for a measurement repetition time in the range of milliseconds is the sampling rate of an ECG. An example for a measurement repetition time in the range of hours is a NIBP that is triggered automatically every hour.
+The update period may be different than the measurement repetition time, if the device does not update the published observed value with the same frequency as it was measured.
      */
     @Child(name = "measurementPeriod", type = {Timing.class}, order=8, min=0, max=1)
-    @Description(shortDefinition="Describes the measurement repetition time", formalDefinition="Describes the measurement repetition time. This is not\nnecessarily the same as the update\nperiod." )
+    @Description(shortDefinition="Describes the measurement repetition time", formalDefinition="Describes the measurement repetition time. This is not necessarily the same as the update period.\nThe measurement repetition time can range from milliseconds up to hours. An example for a measurement repetition time in the range of milliseconds is the sampling rate of an ECG. An example for a measurement repetition time in the range of hours is a NIBP that is triggered automatically every hour.\nThe update period may be different than the measurement repetition time, if the device does not update the published observed value with the same frequency as it was measured." )
     protected Timing measurementPeriod;
 
     /**
@@ -1132,7 +1132,7 @@ An example would be a DeviceComponent that represents a Channel. This reference
     }
 
     /**
-     * @return {@link #color} (Describes the typical color of the representation of observations that have been generated for this DeviceMetric.). This is the underlying object with id, value and extensions. The accessor "getColor" gives direct access to the value
+     * @return {@link #color} (Describes the color representation for the metric. This is often used to aid clinicians to track and identify parameter types by color. In practice, consider a Patient Monitor that has ECG/HR and Pleth for example; the parameters are displayed in different characteristic colors, such as HR-blue, BP-green, and PR and SpO2- magenta.). This is the underlying object with id, value and extensions. The accessor "getColor" gives direct access to the value
      */
     public Enumeration<DeviceMetricColor> getColorElement() { 
       if (this.color == null)
@@ -1152,7 +1152,7 @@ An example would be a DeviceComponent that represents a Channel. This reference
     }
 
     /**
-     * @param value {@link #color} (Describes the typical color of the representation of observations that have been generated for this DeviceMetric.). This is the underlying object with id, value and extensions. The accessor "getColor" gives direct access to the value
+     * @param value {@link #color} (Describes the color representation for the metric. This is often used to aid clinicians to track and identify parameter types by color. In practice, consider a Patient Monitor that has ECG/HR and Pleth for example; the parameters are displayed in different characteristic colors, such as HR-blue, BP-green, and PR and SpO2- magenta.). This is the underlying object with id, value and extensions. The accessor "getColor" gives direct access to the value
      */
     public DeviceMetric setColorElement(Enumeration<DeviceMetricColor> value) { 
       this.color = value;
@@ -1160,14 +1160,14 @@ An example would be a DeviceComponent that represents a Channel. This reference
     }
 
     /**
-     * @return Describes the typical color of the representation of observations that have been generated for this DeviceMetric.
+     * @return Describes the color representation for the metric. This is often used to aid clinicians to track and identify parameter types by color. In practice, consider a Patient Monitor that has ECG/HR and Pleth for example; the parameters are displayed in different characteristic colors, such as HR-blue, BP-green, and PR and SpO2- magenta.
      */
     public DeviceMetricColor getColor() { 
       return this.color == null ? null : this.color.getValue();
     }
 
     /**
-     * @param value Describes the typical color of the representation of observations that have been generated for this DeviceMetric.
+     * @param value Describes the color representation for the metric. This is often used to aid clinicians to track and identify parameter types by color. In practice, consider a Patient Monitor that has ECG/HR and Pleth for example; the parameters are displayed in different characteristic colors, such as HR-blue, BP-green, and PR and SpO2- magenta.
      */
     public DeviceMetric setColor(DeviceMetricColor value) { 
       if (value == null)
@@ -1226,9 +1226,9 @@ An example would be a DeviceComponent that represents a Channel. This reference
     }
 
     /**
-     * @return {@link #measurementPeriod} (Describes the measurement repetition time. This is not
-necessarily the same as the update
-period.)
+     * @return {@link #measurementPeriod} (Describes the measurement repetition time. This is not necessarily the same as the update period.
+The measurement repetition time can range from milliseconds up to hours. An example for a measurement repetition time in the range of milliseconds is the sampling rate of an ECG. An example for a measurement repetition time in the range of hours is a NIBP that is triggered automatically every hour.
+The update period may be different than the measurement repetition time, if the device does not update the published observed value with the same frequency as it was measured.)
      */
     public Timing getMeasurementPeriod() { 
       if (this.measurementPeriod == null)
@@ -1244,9 +1244,9 @@ period.)
     }
 
     /**
-     * @param value {@link #measurementPeriod} (Describes the measurement repetition time. This is not
-necessarily the same as the update
-period.)
+     * @param value {@link #measurementPeriod} (Describes the measurement repetition time. This is not necessarily the same as the update period.
+The measurement repetition time can range from milliseconds up to hours. An example for a measurement repetition time in the range of milliseconds is the sampling rate of an ECG. An example for a measurement repetition time in the range of hours is a NIBP that is triggered automatically every hour.
+The update period may be different than the measurement repetition time, if the device does not update the published observed value with the same frequency as it was measured.)
      */
     public DeviceMetric setMeasurementPeriod(Timing value) { 
       this.measurementPeriod = value;
@@ -1301,9 +1301,9 @@ period.)
         childrenList.add(new Property("source", "Reference(Device)", "Describes the link to the  Device that this DeviceMetric belongs to and that contains administrative device information such as manufacture, serial number, etc.", 0, java.lang.Integer.MAX_VALUE, source));
         childrenList.add(new Property("parent", "Reference(DeviceComponent)", "Describes the link to the  DeviceComponent that this DeviceMetric belongs to and that provide information about the location of this DeviceMetric in the containment structure of the parent Device.\nAn example would be a DeviceComponent that represents a Channel. This reference can be used by a client application to distinguish DeviceMetrics that have the same type, but should be interpreted based on their containment location.", 0, java.lang.Integer.MAX_VALUE, parent));
         childrenList.add(new Property("operationalStatus", "code", "Indicates current operational state of the device. For example: On, Off, Standby, etc.", 0, java.lang.Integer.MAX_VALUE, operationalStatus));
-        childrenList.add(new Property("color", "code", "Describes the typical color of the representation of observations that have been generated for this DeviceMetric.", 0, java.lang.Integer.MAX_VALUE, color));
+        childrenList.add(new Property("color", "code", "Describes the color representation for the metric. This is often used to aid clinicians to track and identify parameter types by color. In practice, consider a Patient Monitor that has ECG/HR and Pleth for example; the parameters are displayed in different characteristic colors, such as HR-blue, BP-green, and PR and SpO2- magenta.", 0, java.lang.Integer.MAX_VALUE, color));
         childrenList.add(new Property("category", "code", "Indicates the category of the observation generation process. A DeviceMetric can be for example a setting, measurement, or calculation.", 0, java.lang.Integer.MAX_VALUE, category));
-        childrenList.add(new Property("measurementPeriod", "Timing", "Describes the measurement repetition time. This is not\nnecessarily the same as the update\nperiod.", 0, java.lang.Integer.MAX_VALUE, measurementPeriod));
+        childrenList.add(new Property("measurementPeriod", "Timing", "Describes the measurement repetition time. This is not necessarily the same as the update period.\nThe measurement repetition time can range from milliseconds up to hours. An example for a measurement repetition time in the range of milliseconds is the sampling rate of an ECG. An example for a measurement repetition time in the range of hours is a NIBP that is triggered automatically every hour.\nThe update period may be different than the measurement repetition time, if the device does not update the published observed value with the same frequency as it was measured.", 0, java.lang.Integer.MAX_VALUE, measurementPeriod));
         childrenList.add(new Property("calibration", "", "Describes the calibrations that have been performed or that are required to be performed.", 0, java.lang.Integer.MAX_VALUE, calibration));
       }
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -133,16 +133,16 @@ public class DeviceUseRequest extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PROPOSED: return "http://hl7.org.fhir/device-use-request-status";
-            case PLANNED: return "http://hl7.org.fhir/device-use-request-status";
-            case REQUESTED: return "http://hl7.org.fhir/device-use-request-status";
-            case RECEIVED: return "http://hl7.org.fhir/device-use-request-status";
-            case ACCEPTED: return "http://hl7.org.fhir/device-use-request-status";
-            case INPROGRESS: return "http://hl7.org.fhir/device-use-request-status";
-            case COMPLETED: return "http://hl7.org.fhir/device-use-request-status";
-            case SUSPENDED: return "http://hl7.org.fhir/device-use-request-status";
-            case REJECTED: return "http://hl7.org.fhir/device-use-request-status";
-            case ABORTED: return "http://hl7.org.fhir/device-use-request-status";
+            case PROPOSED: return "http://hl7.org/fhir/device-use-request-status";
+            case PLANNED: return "http://hl7.org/fhir/device-use-request-status";
+            case REQUESTED: return "http://hl7.org/fhir/device-use-request-status";
+            case RECEIVED: return "http://hl7.org/fhir/device-use-request-status";
+            case ACCEPTED: return "http://hl7.org/fhir/device-use-request-status";
+            case INPROGRESS: return "http://hl7.org/fhir/device-use-request-status";
+            case COMPLETED: return "http://hl7.org/fhir/device-use-request-status";
+            case SUSPENDED: return "http://hl7.org/fhir/device-use-request-status";
+            case REJECTED: return "http://hl7.org/fhir/device-use-request-status";
+            case ABORTED: return "http://hl7.org/fhir/device-use-request-status";
             default: return "?";
           }
         }
@@ -275,10 +275,10 @@ public class DeviceUseRequest extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case ROUTINE: return "http://hl7.org.fhir/device-use-request-priority";
-            case URGENT: return "http://hl7.org.fhir/device-use-request-priority";
-            case STAT: return "http://hl7.org.fhir/device-use-request-priority";
-            case ASAP: return "http://hl7.org.fhir/device-use-request-priority";
+            case ROUTINE: return "http://hl7.org/fhir/device-use-request-priority";
+            case URGENT: return "http://hl7.org/fhir/device-use-request-priority";
+            case STAT: return "http://hl7.org/fhir/device-use-request-priority";
+            case ASAP: return "http://hl7.org/fhir/device-use-request-priority";
             default: return "?";
           }
         }
@@ -470,6 +470,10 @@ public class DeviceUseRequest extends DomainResource {
       return (CodeableConcept) this.bodySite;
     }
 
+    public boolean hasBodySiteCodeableConcept() throws Exception { 
+      return this.bodySite instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #bodySite} (Indicates the site on the subject's body where the device should be used ( i.e. the target site).)
      */
@@ -479,6 +483,10 @@ public class DeviceUseRequest extends DomainResource {
       return (Reference) this.bodySite;
     }
 
+    public boolean hasBodySiteReference() throws Exception { 
+      return this.bodySite instanceof Reference;
+    }
+
     public boolean hasBodySite() { 
       return this.bodySite != null && !this.bodySite.isEmpty();
     }
@@ -960,6 +968,10 @@ public class DeviceUseRequest extends DomainResource {
       return (Timing) this.timing;
     }
 
+    public boolean hasTimingTiming() throws Exception { 
+      return this.timing instanceof Timing;
+    }
+
     /**
      * @return {@link #timing} (The timing schedule for the use of the device The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".)
      */
@@ -969,6 +981,10 @@ public class DeviceUseRequest extends DomainResource {
       return (Period) this.timing;
     }
 
+    public boolean hasTimingPeriod() throws Exception { 
+      return this.timing instanceof Period;
+    }
+
     /**
      * @return {@link #timing} (The timing schedule for the use of the device The Schedule data type allows many different expressions, for example. "Every 8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:"; "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".)
      */
@@ -978,6 +994,10 @@ public class DeviceUseRequest extends DomainResource {
       return (DateTimeType) this.timing;
     }
 
+    public boolean hasTimingDateTimeType() throws Exception { 
+      return this.timing instanceof DateTimeType;
+    }
+
     public boolean hasTiming() { 
       return this.timing != null && !this.timing.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -153,6 +153,10 @@ public class DeviceUseStatement extends DomainResource {
       return (CodeableConcept) this.bodySite;
     }
 
+    public boolean hasBodySiteCodeableConcept() throws Exception { 
+      return this.bodySite instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #bodySite} (Indicates the site on the subject's body where the device was used ( i.e. the target site).)
      */
@@ -162,6 +166,10 @@ public class DeviceUseStatement extends DomainResource {
       return (Reference) this.bodySite;
     }
 
+    public boolean hasBodySiteReference() throws Exception { 
+      return this.bodySite instanceof Reference;
+    }
+
     public boolean hasBodySite() { 
       return this.bodySite != null && !this.bodySite.isEmpty();
     }
@@ -485,6 +493,10 @@ public class DeviceUseStatement extends DomainResource {
       return (Timing) this.timing;
     }
 
+    public boolean hasTimingTiming() throws Exception { 
+      return this.timing instanceof Timing;
+    }
+
     /**
      * @return {@link #timing} (How often the device was used.)
      */
@@ -494,6 +506,10 @@ public class DeviceUseStatement extends DomainResource {
       return (Period) this.timing;
     }
 
+    public boolean hasTimingPeriod() throws Exception { 
+      return this.timing instanceof Period;
+    }
+
     /**
      * @return {@link #timing} (How often the device was used.)
      */
@@ -503,6 +519,10 @@ public class DeviceUseStatement extends DomainResource {
       return (DateTimeType) this.timing;
     }
 
+    public boolean hasTimingDateTimeType() throws Exception { 
+      return this.timing instanceof DateTimeType;
+    }
+
     public boolean hasTiming() { 
       return this.timing != null && !this.timing.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -154,19 +154,19 @@ public class DiagnosticOrder extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PROPOSED: return "http://hl7.org.fhir/diagnostic-order-status";
-            case DRAFT: return "http://hl7.org.fhir/diagnostic-order-status";
-            case PLANNED: return "http://hl7.org.fhir/diagnostic-order-status";
-            case REQUESTED: return "http://hl7.org.fhir/diagnostic-order-status";
-            case RECEIVED: return "http://hl7.org.fhir/diagnostic-order-status";
-            case ACCEPTED: return "http://hl7.org.fhir/diagnostic-order-status";
-            case INPROGRESS: return "http://hl7.org.fhir/diagnostic-order-status";
-            case REVIEW: return "http://hl7.org.fhir/diagnostic-order-status";
-            case COMPLETED: return "http://hl7.org.fhir/diagnostic-order-status";
-            case CANCELLED: return "http://hl7.org.fhir/diagnostic-order-status";
-            case SUSPENDED: return "http://hl7.org.fhir/diagnostic-order-status";
-            case REJECTED: return "http://hl7.org.fhir/diagnostic-order-status";
-            case FAILED: return "http://hl7.org.fhir/diagnostic-order-status";
+            case PROPOSED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case DRAFT: return "http://hl7.org/fhir/diagnostic-order-status";
+            case PLANNED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case REQUESTED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case RECEIVED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case ACCEPTED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case INPROGRESS: return "http://hl7.org/fhir/diagnostic-order-status";
+            case REVIEW: return "http://hl7.org/fhir/diagnostic-order-status";
+            case COMPLETED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case CANCELLED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case SUSPENDED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case REJECTED: return "http://hl7.org/fhir/diagnostic-order-status";
+            case FAILED: return "http://hl7.org/fhir/diagnostic-order-status";
             default: return "?";
           }
         }
@@ -317,10 +317,10 @@ public class DiagnosticOrder extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case ROUTINE: return "http://hl7.org.fhir/diagnostic-order-priority";
-            case URGENT: return "http://hl7.org.fhir/diagnostic-order-priority";
-            case STAT: return "http://hl7.org.fhir/diagnostic-order-priority";
-            case ASAP: return "http://hl7.org.fhir/diagnostic-order-priority";
+            case ROUTINE: return "http://hl7.org/fhir/diagnostic-order-priority";
+            case URGENT: return "http://hl7.org/fhir/diagnostic-order-priority";
+            case STAT: return "http://hl7.org/fhir/diagnostic-order-priority";
+            case ASAP: return "http://hl7.org/fhir/diagnostic-order-priority";
             default: return "?";
           }
         }
@@ -784,6 +784,10 @@ public class DiagnosticOrder extends DomainResource {
           return (CodeableConcept) this.bodySite;
         }
 
+        public boolean hasBodySiteCodeableConcept() throws Exception { 
+          return this.bodySite instanceof CodeableConcept;
+        }
+
         /**
          * @return {@link #bodySite} (Anatomical location where the request test should be performed.  This is the target site.)
          */
@@ -793,6 +797,10 @@ public class DiagnosticOrder extends DomainResource {
           return (Reference) this.bodySite;
         }
 
+        public boolean hasBodySiteReference() throws Exception { 
+          return this.bodySite instanceof Reference;
+        }
+
         public boolean hasBodySite() { 
           return this.bodySite != null && !this.bodySite.isEmpty();
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -112,13 +112,13 @@ public class DiagnosticReport extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case REGISTERED: return "http://hl7.org.fhir/diagnostic-report-status";
-            case PARTIAL: return "http://hl7.org.fhir/diagnostic-report-status";
-            case FINAL: return "http://hl7.org.fhir/diagnostic-report-status";
-            case CORRECTED: return "http://hl7.org.fhir/diagnostic-report-status";
-            case APPENDED: return "http://hl7.org.fhir/diagnostic-report-status";
-            case CANCELLED: return "http://hl7.org.fhir/diagnostic-report-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/diagnostic-report-status";
+            case REGISTERED: return "http://hl7.org/fhir/diagnostic-report-status";
+            case PARTIAL: return "http://hl7.org/fhir/diagnostic-report-status";
+            case FINAL: return "http://hl7.org/fhir/diagnostic-report-status";
+            case CORRECTED: return "http://hl7.org/fhir/diagnostic-report-status";
+            case APPENDED: return "http://hl7.org/fhir/diagnostic-report-status";
+            case CANCELLED: return "http://hl7.org/fhir/diagnostic-report-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/diagnostic-report-status";
             default: return "?";
           }
         }
@@ -363,9 +363,9 @@ public class DiagnosticReport extends DomainResource {
     /**
      * A code or name that describes this diagnostic report.
      */
-    @Child(name = "name", type = {CodeableConcept.class}, order=0, min=1, max=1)
+    @Child(name = "code", type = {CodeableConcept.class}, order=0, min=1, max=1)
     @Description(shortDefinition="Name/Code for this diagnostic report", formalDefinition="A code or name that describes this diagnostic report." )
-    protected CodeableConcept name;
+    protected CodeableConcept code;
 
     /**
      * The status of the diagnostic report as a whole.
@@ -477,13 +477,13 @@ public class DiagnosticReport extends DomainResource {
     /**
      * One or more links to full details of any imaging performed during the diagnostic investigation. Typically, this is imaging performed by DICOM enabled modalities, but this is not required. A fully enabled PACS viewer can use this information to provide views of the source images.
      */
-    @Child(name = "imagingStudy", type = {ImagingStudy.class}, order=12, min=0, max=Child.MAX_UNLIMITED)
+    @Child(name = "imagingStudy", type = {ImagingStudy.class, ImagingObjectSelection.class}, order=12, min=0, max=Child.MAX_UNLIMITED)
     @Description(shortDefinition="Reference to full details of imaging associated with the diagnostic report", formalDefinition="One or more links to full details of any imaging performed during the diagnostic investigation. Typically, this is imaging performed by DICOM enabled modalities, but this is not required. A fully enabled PACS viewer can use this information to provide views of the source images." )
     protected List<Reference> imagingStudy;
     /**
      * The actual objects that are the target of the reference (One or more links to full details of any imaging performed during the diagnostic investigation. Typically, this is imaging performed by DICOM enabled modalities, but this is not required. A fully enabled PACS viewer can use this information to provide views of the source images.)
      */
-    protected List<ImagingStudy> imagingStudyTarget;
+    protected List<Resource> imagingStudyTarget;
 
 
     /**
@@ -514,7 +514,7 @@ public class DiagnosticReport extends DomainResource {
     @Description(shortDefinition="Entire Report as issued", formalDefinition="Rich text representation of the entire result as issued by the diagnostic service. Multiple formats are allowed but they SHALL be semantically equivalent." )
     protected List<Attachment> presentedForm;
 
-    private static final long serialVersionUID = 486295410L;
+    private static final long serialVersionUID = 14484749L;
 
   /*
    * Constructor
@@ -526,9 +526,9 @@ public class DiagnosticReport extends DomainResource {
   /*
    * Constructor
    */
-    public DiagnosticReport(CodeableConcept name, Enumeration<DiagnosticReportStatus> status, InstantType issued, Reference subject, Reference performer, Type effective) {
+    public DiagnosticReport(CodeableConcept code, Enumeration<DiagnosticReportStatus> status, InstantType issued, Reference subject, Reference performer, Type effective) {
       super();
-      this.name = name;
+      this.code = code;
       this.status = status;
       this.issued = issued;
       this.subject = subject;
@@ -537,26 +537,26 @@ public class DiagnosticReport extends DomainResource {
     }
 
     /**
-     * @return {@link #name} (A code or name that describes this diagnostic report.)
+     * @return {@link #code} (A code or name that describes this diagnostic report.)
      */
-    public CodeableConcept getName() { 
-      if (this.name == null)
+    public CodeableConcept getCode() { 
+      if (this.code == null)
         if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create DiagnosticReport.name");
+          throw new Error("Attempt to auto-create DiagnosticReport.code");
         else if (Configuration.doAutoCreate())
-          this.name = new CodeableConcept(); // cc
-      return this.name;
+          this.code = new CodeableConcept(); // cc
+      return this.code;
     }
 
-    public boolean hasName() { 
-      return this.name != null && !this.name.isEmpty();
+    public boolean hasCode() { 
+      return this.code != null && !this.code.isEmpty();
     }
 
     /**
-     * @param value {@link #name} (A code or name that describes this diagnostic report.)
+     * @param value {@link #code} (A code or name that describes this diagnostic report.)
      */
-    public DiagnosticReport setName(CodeableConcept value) { 
-      this.name = value;
+    public DiagnosticReport setCode(CodeableConcept value) { 
+      this.code = value;
       return this;
     }
 
@@ -913,6 +913,10 @@ public class DiagnosticReport extends DomainResource {
       return (DateTimeType) this.effective;
     }
 
+    public boolean hasEffectiveDateTimeType() throws Exception { 
+      return this.effective instanceof DateTimeType;
+    }
+
     /**
      * @return {@link #effective} (The time or time-period the observed values are related to. When the subject of the report is a patient, this is usually either the time of the procedure or of specimen collection(s), but very often the source of the date/time is not known, only the date/time itself.)
      */
@@ -922,6 +926,10 @@ public class DiagnosticReport extends DomainResource {
       return (Period) this.effective;
     }
 
+    public boolean hasEffectivePeriod() throws Exception { 
+      return this.effective instanceof Period;
+    }
+
     public boolean hasEffective() { 
       return this.effective != null && !this.effective.isEmpty();
     }
@@ -1099,24 +1107,12 @@ public class DiagnosticReport extends DomainResource {
     /**
      * @return {@link #imagingStudy} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. One or more links to full details of any imaging performed during the diagnostic investigation. Typically, this is imaging performed by DICOM enabled modalities, but this is not required. A fully enabled PACS viewer can use this information to provide views of the source images.)
      */
-    public List<ImagingStudy> getImagingStudyTarget() { 
+    public List<Resource> getImagingStudyTarget() { 
       if (this.imagingStudyTarget == null)
-        this.imagingStudyTarget = new ArrayList<ImagingStudy>();
+        this.imagingStudyTarget = new ArrayList<Resource>();
       return this.imagingStudyTarget;
     }
 
-    // syntactic sugar
-    /**
-     * @return {@link #imagingStudy} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. One or more links to full details of any imaging performed during the diagnostic investigation. Typically, this is imaging performed by DICOM enabled modalities, but this is not required. A fully enabled PACS viewer can use this information to provide views of the source images.)
-     */
-    public ImagingStudy addImagingStudyTarget() { 
-      ImagingStudy r = new ImagingStudy();
-      if (this.imagingStudyTarget == null)
-        this.imagingStudyTarget = new ArrayList<ImagingStudy>();
-      this.imagingStudyTarget.add(r);
-      return r;
-    }
-
     /**
      * @return {@link #image} (A list of key images associated with this report. The images are generally created during the diagnostic process, and may be directly of the patient, or of treated specimens (i.e. slides of interest).)
      */
@@ -1288,7 +1284,7 @@ public class DiagnosticReport extends DomainResource {
 
       protected void listChildren(List<Property> childrenList) {
         super.listChildren(childrenList);
-        childrenList.add(new Property("name", "CodeableConcept", "A code or name that describes this diagnostic report.", 0, java.lang.Integer.MAX_VALUE, name));
+        childrenList.add(new Property("code", "CodeableConcept", "A code or name that describes this diagnostic report.", 0, java.lang.Integer.MAX_VALUE, code));
         childrenList.add(new Property("status", "code", "The status of the diagnostic report as a whole.", 0, java.lang.Integer.MAX_VALUE, status));
         childrenList.add(new Property("issued", "instant", "The date and time that this version of the report was released from the source diagnostic service.", 0, java.lang.Integer.MAX_VALUE, issued));
         childrenList.add(new Property("subject", "Reference(Patient|Group|Device|Location)", "The subject of the report. Usually, but not always, this is a patient. However diagnostic services also perform analyses on specimens collected from a variety of other sources.", 0, java.lang.Integer.MAX_VALUE, subject));
@@ -1300,7 +1296,7 @@ public class DiagnosticReport extends DomainResource {
         childrenList.add(new Property("effective[x]", "dateTime|Period", "The time or time-period the observed values are related to. When the subject of the report is a patient, this is usually either the time of the procedure or of specimen collection(s), but very often the source of the date/time is not known, only the date/time itself.", 0, java.lang.Integer.MAX_VALUE, effective));
         childrenList.add(new Property("specimen", "Reference(Specimen)", "Details about the specimens on which this diagnostic report is based.", 0, java.lang.Integer.MAX_VALUE, specimen));
         childrenList.add(new Property("result", "Reference(Observation)", "Observations that are part of this diagnostic report. Observations can be simple name/value pairs (e.g. 'atomic' results), or they can be grouping observations that include references to other members of the group (e.g. 'panels').", 0, java.lang.Integer.MAX_VALUE, result));
-        childrenList.add(new Property("imagingStudy", "Reference(ImagingStudy)", "One or more links to full details of any imaging performed during the diagnostic investigation. Typically, this is imaging performed by DICOM enabled modalities, but this is not required. A fully enabled PACS viewer can use this information to provide views of the source images.", 0, java.lang.Integer.MAX_VALUE, imagingStudy));
+        childrenList.add(new Property("imagingStudy", "Reference(ImagingStudy|ImagingObjectSelection)", "One or more links to full details of any imaging performed during the diagnostic investigation. Typically, this is imaging performed by DICOM enabled modalities, but this is not required. A fully enabled PACS viewer can use this information to provide views of the source images.", 0, java.lang.Integer.MAX_VALUE, imagingStudy));
         childrenList.add(new Property("image", "", "A list of key images associated with this report. The images are generally created during the diagnostic process, and may be directly of the patient, or of treated specimens (i.e. slides of interest).", 0, java.lang.Integer.MAX_VALUE, image));
         childrenList.add(new Property("conclusion", "string", "Concise and clinically contextualized narrative interpretation of the diagnostic report.", 0, java.lang.Integer.MAX_VALUE, conclusion));
         childrenList.add(new Property("codedDiagnosis", "CodeableConcept", "Codes for the conclusion.", 0, java.lang.Integer.MAX_VALUE, codedDiagnosis));
@@ -1310,7 +1306,7 @@ public class DiagnosticReport extends DomainResource {
       public DiagnosticReport copy() {
         DiagnosticReport dst = new DiagnosticReport();
         copyValues(dst);
-        dst.name = name == null ? null : name.copy();
+        dst.code = code == null ? null : code.copy();
         dst.status = status == null ? null : status.copy();
         dst.issued = issued == null ? null : issued.copy();
         dst.subject = subject == null ? null : subject.copy();
@@ -1373,7 +1369,7 @@ public class DiagnosticReport extends DomainResource {
         if (!(other instanceof DiagnosticReport))
           return false;
         DiagnosticReport o = (DiagnosticReport) other;
-        return compareDeep(name, o.name, true) && compareDeep(status, o.status, true) && compareDeep(issued, o.issued, true)
+        return compareDeep(code, o.code, true) && compareDeep(status, o.status, true) && compareDeep(issued, o.issued, true)
            && compareDeep(subject, o.subject, true) && compareDeep(performer, o.performer, true) && compareDeep(encounter, o.encounter, true)
            && compareDeep(identifier, o.identifier, true) && compareDeep(requestDetail, o.requestDetail, true)
            && compareDeep(serviceCategory, o.serviceCategory, true) && compareDeep(effective, o.effective, true)
@@ -1394,7 +1390,7 @@ public class DiagnosticReport extends DomainResource {
       }
 
       public boolean isEmpty() {
-        return super.isEmpty() && (name == null || name.isEmpty()) && (status == null || status.isEmpty())
+        return super.isEmpty() && (code == null || code.isEmpty()) && (status == null || status.isEmpty())
            && (issued == null || issued.isEmpty()) && (subject == null || subject.isEmpty()) && (performer == null || performer.isEmpty())
            && (encounter == null || encounter.isEmpty()) && (identifier == null || identifier.isEmpty())
            && (requestDetail == null || requestDetail.isEmpty()) && (serviceCategory == null || serviceCategory.isEmpty())
@@ -1419,6 +1415,8 @@ public class DiagnosticReport extends DomainResource {
   public static final String SP_REQUEST = "request";
   @SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)", type="reference" )
   public static final String SP_PERFORMER = "performer";
+  @SearchParamDefinition(name="code", path="DiagnosticReport.code", description="The code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result", type="token" )
+  public static final String SP_CODE = "code";
   @SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report", type="reference" )
   public static final String SP_SUBJECT = "subject";
   @SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report", type="token" )
@@ -1433,8 +1431,6 @@ public class DiagnosticReport extends DomainResource {
   public static final String SP_PATIENT = "patient";
   @SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details", type="reference" )
   public static final String SP_SPECIMEN = "specimen";
-  @SearchParamDefinition(name="name", path="DiagnosticReport.name", description="The name of the report (e.g. the code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result)", type="token" )
-  public static final String SP_NAME = "name";
   @SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued", type="date" )
   public static final String SP_ISSUED = "issued";
   @SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report", type="token" )

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import org.hl7.fhir.instance.model.annotations.DatatypeDef;
 import org.hl7.fhir.instance.model.annotations.Block;

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -89,6 +89,10 @@ public class DocumentManifest extends DomainResource {
           return (Attachment) this.p;
         }
 
+        public boolean hasPAttachment() throws Exception { 
+          return this.p instanceof Attachment;
+        }
+
         /**
          * @return {@link #p} (The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed.)
          */
@@ -98,6 +102,10 @@ public class DocumentManifest extends DomainResource {
           return (Reference) this.p;
         }
 
+        public boolean hasPReference() throws Exception { 
+          return this.p instanceof Reference;
+        }
+
         public boolean hasP() { 
           return this.p != null && !this.p.isEmpty();
         }
@@ -357,7 +365,7 @@ public class DocumentManifest extends DomainResource {
      * The status of this document manifest.
      */
     @Child(name = "status", type = {CodeType.class}, order=8, min=1, max=1)
-    @Description(shortDefinition="current | superceded | entered-in-error", formalDefinition="The status of this document manifest." )
+    @Description(shortDefinition="current | superseded | entered-in-error", formalDefinition="The status of this document manifest." )
     protected Enumeration<DocumentReferenceStatus> status;
 
     /**
@@ -1013,7 +1021,7 @@ public class DocumentManifest extends DomainResource {
   public static final String SP_PATIENT = "patient";
   @SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="Intended to get notified about this set of documents", type="reference" )
   public static final String SP_RECIPIENT = "recipient";
-  @SearchParamDefinition(name="status", path="DocumentManifest.status", description="current | superceded | entered-in-error", type="token" )
+  @SearchParamDefinition(name="status", path="DocumentManifest.status", description="current | superseded | entered-in-error", type="token" )
   public static final String SP_STATUS = "status";
   @SearchParamDefinition(name="contentref", path="DocumentManifest.content.pReference", description="Contents of this set of documents", type="reference" )
   public static final String SP_CONTENTREF = "contentref";

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -49,7 +49,7 @@ public class DocumentReference extends DomainResource {
 
     public enum DocumentRelationshipType {
         /**
-         * This document logically replaces or supercedes the target document
+         * This document logically replaces or supersedes the target document
          */
         REPLACES, 
         /**
@@ -92,16 +92,16 @@ public class DocumentReference extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case REPLACES: return "http://hl7.org.fhir/document-relationship-type";
-            case TRANSFORMS: return "http://hl7.org.fhir/document-relationship-type";
-            case SIGNS: return "http://hl7.org.fhir/document-relationship-type";
-            case APPENDS: return "http://hl7.org.fhir/document-relationship-type";
+            case REPLACES: return "http://hl7.org/fhir/document-relationship-type";
+            case TRANSFORMS: return "http://hl7.org/fhir/document-relationship-type";
+            case SIGNS: return "http://hl7.org/fhir/document-relationship-type";
+            case APPENDS: return "http://hl7.org/fhir/document-relationship-type";
             default: return "?";
           }
         }
         public String getDefinition() {
           switch (this) {
-            case REPLACES: return "This document logically replaces or supercedes the target document";
+            case REPLACES: return "This document logically replaces or supersedes the target document";
             case TRANSFORMS: return "This document was generated by transforming the target document (e.g. format or language conversion)";
             case SIGNS: return "This document is a signature of the target document";
             case APPENDS: return "This document adds additional information to the target document";
@@ -801,7 +801,7 @@ public class DocumentReference extends DomainResource {
     /**
      * A categorization for the type of document. The class is an abstraction from the type specifying the high-level kind of document  (e.g., Report, Summary, Images, Treatment Plan, Patient Preferences, Workflow) at a macro level.
      */
-    @Child(name = "class", type = {CodeableConcept.class}, order=4, min=0, max=1)
+    @Child(name = "class_", type = {CodeableConcept.class}, order=4, min=0, max=1)
     @Description(shortDefinition="Categorization of document", formalDefinition="A categorization for the type of document. The class is an abstraction from the type specifying the high-level kind of document  (e.g., Report, Summary, Images, Treatment Plan, Patient Preferences, Workflow) at a macro level." )
     protected CodeableConcept class_;
 
@@ -866,7 +866,7 @@ public class DocumentReference extends DomainResource {
      * The status of this document reference.
      */
     @Child(name = "status", type = {CodeType.class}, order=11, min=1, max=1)
-    @Description(shortDefinition="current | superceded | entered-in-error", formalDefinition="The status of this document reference." )
+    @Description(shortDefinition="current | superseded | entered-in-error", formalDefinition="The status of this document reference." )
     protected Enumeration<DocumentReferenceStatus> status;
 
     /**
@@ -1788,7 +1788,7 @@ public class DocumentReference extends DomainResource {
   public static final String SP_RELATESTO = "relatesto";
   @SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="Kind of facility where patient was seen", type="token" )
   public static final String SP_FACILITY = "facility";
-  @SearchParamDefinition(name="status", path="DocumentReference.status", description="current | superceded | entered-in-error", type="token" )
+  @SearchParamDefinition(name="status", path="DocumentReference.status", description="current | superseded | entered-in-error", type="token" )
   public static final String SP_STATUS = "status";
 
 }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import org.hl7.fhir.instance.model.annotations.DatatypeDef;
 import org.hl7.fhir.instance.model.annotations.Block;

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -70,7 +70,7 @@ public class ElementDefinition extends Type implements ICompositeType {
         }
         public String getSystem() {
           switch (this) {
-            case XMLATTR: return "http://hl7.org.fhir/property-representation";
+            case XMLATTR: return "http://hl7.org/fhir/property-representation";
             default: return "?";
           }
         }
@@ -142,9 +142,9 @@ public class ElementDefinition extends Type implements ICompositeType {
         }
         public String getSystem() {
           switch (this) {
-            case CLOSED: return "http://hl7.org.fhir/resource-slicing-rules";
-            case OPEN: return "http://hl7.org.fhir/resource-slicing-rules";
-            case OPENATEND: return "http://hl7.org.fhir/resource-slicing-rules";
+            case CLOSED: return "http://hl7.org/fhir/resource-slicing-rules";
+            case OPEN: return "http://hl7.org/fhir/resource-slicing-rules";
+            case OPENATEND: return "http://hl7.org/fhir/resource-slicing-rules";
             default: return "?";
           }
         }
@@ -228,9 +228,9 @@ public class ElementDefinition extends Type implements ICompositeType {
         }
         public String getSystem() {
           switch (this) {
-            case CONTAINED: return "http://hl7.org.fhir/resource-aggregation-mode";
-            case REFERENCED: return "http://hl7.org.fhir/resource-aggregation-mode";
-            case BUNDLED: return "http://hl7.org.fhir/resource-aggregation-mode";
+            case CONTAINED: return "http://hl7.org/fhir/resource-aggregation-mode";
+            case REFERENCED: return "http://hl7.org/fhir/resource-aggregation-mode";
+            case BUNDLED: return "http://hl7.org/fhir/resource-aggregation-mode";
             default: return "?";
           }
         }
@@ -307,8 +307,8 @@ public class ElementDefinition extends Type implements ICompositeType {
         }
         public String getSystem() {
           switch (this) {
-            case ERROR: return "http://hl7.org.fhir/constraint-severity";
-            case WARNING: return "http://hl7.org.fhir/constraint-severity";
+            case ERROR: return "http://hl7.org/fhir/constraint-severity";
+            case WARNING: return "http://hl7.org/fhir/constraint-severity";
             default: return "?";
           }
         }
@@ -348,106 +348,6 @@ public class ElementDefinition extends Type implements ICompositeType {
       }
     }
 
-    public enum BindingStrength {
-        /**
-         * To be conformant, instances of this element SHALL include a code from the specified value set
-         */
-        REQUIRED, 
-        /**
-         * To be conformant, instances of this element SHALL include a code from the specified value set if any of the codes within the value set can apply to the concept being communicated.  If the valueset does not cover the concept (based on human review), alternate codings (or, data type allowing, text) may be included instead.
-         */
-        EXTENSIBLE, 
-        /**
-         * Instances are encouraged to draw from the specified codes for interoperability purposes but are not required to do so to be considered conformant
-         */
-        PREFERRED, 
-        /**
-         * Instances are not expected or even encouraged to draw from the specified value set.  The value set merely provides examples of the types of concepts intended to be included
-         */
-        EXAMPLE, 
-        /**
-         * added to help the parsers
-         */
-        NULL;
-        public static BindingStrength fromCode(String codeString) throws Exception {
-            if (codeString == null || "".equals(codeString))
-                return null;
-        if ("required".equals(codeString))
-          return REQUIRED;
-        if ("extensible".equals(codeString))
-          return EXTENSIBLE;
-        if ("preferred".equals(codeString))
-          return PREFERRED;
-        if ("example".equals(codeString))
-          return EXAMPLE;
-        throw new Exception("Unknown BindingStrength code '"+codeString+"'");
-        }
-        public String toCode() {
-          switch (this) {
-            case REQUIRED: return "required";
-            case EXTENSIBLE: return "extensible";
-            case PREFERRED: return "preferred";
-            case EXAMPLE: return "example";
-            default: return "?";
-          }
-        }
-        public String getSystem() {
-          switch (this) {
-            case REQUIRED: return "http://hl7.org.fhir/binding-strength";
-            case EXTENSIBLE: return "http://hl7.org.fhir/binding-strength";
-            case PREFERRED: return "http://hl7.org.fhir/binding-strength";
-            case EXAMPLE: return "http://hl7.org.fhir/binding-strength";
-            default: return "?";
-          }
-        }
-        public String getDefinition() {
-          switch (this) {
-            case REQUIRED: return "To be conformant, instances of this element SHALL include a code from the specified value set";
-            case EXTENSIBLE: return "To be conformant, instances of this element SHALL include a code from the specified value set if any of the codes within the value set can apply to the concept being communicated.  If the valueset does not cover the concept (based on human review), alternate codings (or, data type allowing, text) may be included instead.";
-            case PREFERRED: return "Instances are encouraged to draw from the specified codes for interoperability purposes but are not required to do so to be considered conformant";
-            case EXAMPLE: return "Instances are not expected or even encouraged to draw from the specified value set.  The value set merely provides examples of the types of concepts intended to be included";
-            default: return "?";
-          }
-        }
-        public String getDisplay() {
-          switch (this) {
-            case REQUIRED: return "Required";
-            case EXTENSIBLE: return "Extensible";
-            case PREFERRED: return "Preferred";
-            case EXAMPLE: return "Example";
-            default: return "?";
-          }
-        }
-    }
-
-  public static class BindingStrengthEnumFactory implements EnumFactory<BindingStrength> {
-    public BindingStrength fromCode(String codeString) throws IllegalArgumentException {
-      if (codeString == null || "".equals(codeString))
-            if (codeString == null || "".equals(codeString))
-                return null;
-        if ("required".equals(codeString))
-          return BindingStrength.REQUIRED;
-        if ("extensible".equals(codeString))
-          return BindingStrength.EXTENSIBLE;
-        if ("preferred".equals(codeString))
-          return BindingStrength.PREFERRED;
-        if ("example".equals(codeString))
-          return BindingStrength.EXAMPLE;
-        throw new IllegalArgumentException("Unknown BindingStrength code '"+codeString+"'");
-        }
-    public String toCode(BindingStrength code) {
-      if (code == BindingStrength.REQUIRED)
-        return "required";
-      if (code == BindingStrength.EXTENSIBLE)
-        return "extensible";
-      if (code == BindingStrength.PREFERRED)
-        return "preferred";
-      if (code == BindingStrength.EXAMPLE)
-        return "example";
-      return "?";
-      }
-    }
-
     @Block()
     public static class ElementDefinitionSlicingComponent extends Element implements IBaseDatatypeElement {
         /**
@@ -749,11 +649,11 @@ public class ElementDefinition extends Type implements ICompositeType {
         protected CodeType code;
 
         /**
-         * Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile.
+         * Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile. When more than one profile is specified, the content must conform to all of them.
          */
-        @Child(name = "profile", type = {UriType.class}, order=2, min=0, max=1)
-        @Description(shortDefinition="Profile.structure to apply", formalDefinition="Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile." )
-        protected UriType profile;
+        @Child(name = "profile", type = {UriType.class}, order=2, min=0, max=Child.MAX_UNLIMITED)
+        @Description(shortDefinition="Profile (StructureDefinition) to apply", formalDefinition="Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile. When more than one profile is specified, the content must conform to all of them." )
+        protected List<UriType> profile;
 
         /**
          * 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.
@@ -762,7 +662,7 @@ public class ElementDefinition extends Type implements ICompositeType {
         @Description(shortDefinition="contained | referenced | bundled - how aggregated", formalDefinition="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." )
         protected List<Enumeration<AggregationMode>> aggregation;
 
-        private static final long serialVersionUID = -345007341L;
+        private static final long serialVersionUID = -988693373L;
 
     /*
      * Constructor
@@ -825,52 +725,57 @@ public class ElementDefinition extends Type implements ICompositeType {
         }
 
         /**
-         * @return {@link #profile} (Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile.). This is the underlying object with id, value and extensions. The accessor "getProfile" gives direct access to the value
+         * @return {@link #profile} (Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile. When more than one profile is specified, the content must conform to all of them.)
          */
-        public UriType getProfileElement() { 
+        public List<UriType> getProfile() { 
           if (this.profile == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create TypeRefComponent.profile");
-            else if (Configuration.doAutoCreate())
-              this.profile = new UriType(); // bb
+            this.profile = new ArrayList<UriType>();
           return this.profile;
         }
 
-        public boolean hasProfileElement() { 
-          return this.profile != null && !this.profile.isEmpty();
-        }
-
         public boolean hasProfile() { 
-          return this.profile != null && !this.profile.isEmpty();
+          if (this.profile == null)
+            return false;
+          for (UriType item : this.profile)
+            if (!item.isEmpty())
+              return true;
+          return false;
         }
 
         /**
-         * @param value {@link #profile} (Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile.). This is the underlying object with id, value and extensions. The accessor "getProfile" gives direct access to the value
+         * @return {@link #profile} (Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile. When more than one profile is specified, the content must conform to all of them.)
          */
-        public TypeRefComponent setProfileElement(UriType value) { 
-          this.profile = value;
+    // syntactic sugar
+        public UriType addProfileElement() {//2 
+          UriType t = new UriType();
+          if (this.profile == null)
+            this.profile = new ArrayList<UriType>();
+          this.profile.add(t);
+          return t;
+        }
+
+        /**
+         * @param value {@link #profile} (Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile. When more than one profile is specified, the content must conform to all of them.)
+         */
+        public TypeRefComponent addProfile(String value) { //1
+          UriType t = new UriType();
+          t.setValue(value);
+          if (this.profile == null)
+            this.profile = new ArrayList<UriType>();
+          this.profile.add(t);
           return this;
         }
 
         /**
-         * @return Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile.
+         * @param value {@link #profile} (Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile. When more than one profile is specified, the content must conform to all of them.)
          */
-        public String getProfile() { 
-          return this.profile == null ? null : this.profile.getValue();
-        }
-
-        /**
-         * @param value Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile.
-         */
-        public TypeRefComponent setProfile(String value) { 
-          if (Utilities.noString(value))
-            this.profile = null;
-          else {
-            if (this.profile == null)
-              this.profile = new UriType();
-            this.profile.setValue(value);
-          }
-          return this;
+        public boolean hasProfile(String value) { 
+          if (this.profile == null)
+            return false;
+          for (UriType v : this.profile)
+            if (v.equals(value)) // uri
+              return true;
+          return false;
         }
 
         /**
@@ -930,7 +835,7 @@ public class ElementDefinition extends Type implements ICompositeType {
         protected void listChildren(List<Property> childrenList) {
           super.listChildren(childrenList);
           childrenList.add(new Property("code", "code", "Name of Data type or Resource that is a(or the) type used for this element.", 0, java.lang.Integer.MAX_VALUE, code));
-          childrenList.add(new Property("profile", "uri", "Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile.", 0, java.lang.Integer.MAX_VALUE, profile));
+          childrenList.add(new Property("profile", "uri", "Identifies a profile structure that SHALL hold for resources or datatypes referenced as the type of this element. Can be a local reference - to another structure in this profile, or a reference to a structure in another profile. When more than one profile is specified, the content must conform to all of them.", 0, java.lang.Integer.MAX_VALUE, profile));
           childrenList.add(new Property("aggregation", "code", "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.", 0, java.lang.Integer.MAX_VALUE, aggregation));
         }
 
@@ -938,7 +843,11 @@ public class ElementDefinition extends Type implements ICompositeType {
         TypeRefComponent dst = new TypeRefComponent();
         copyValues(dst);
         dst.code = code == null ? null : code.copy();
-        dst.profile = profile == null ? null : profile.copy();
+        if (profile != null) {
+          dst.profile = new ArrayList<UriType>();
+          for (UriType i : profile)
+            dst.profile.add(i.copy());
+        };
         if (aggregation != null) {
           dst.aggregation = new ArrayList<Enumeration<AggregationMode>>();
           for (Enumeration<AggregationMode> i : aggregation)
@@ -986,11 +895,11 @@ public class ElementDefinition extends Type implements ICompositeType {
         protected IdType key;
 
         /**
-         * Used to label the constraint in OCL or in short displays incapable of displaying the full human description.
+         * Description of why this constraint is necessary or appropriate.
          */
-        @Child(name = "name", type = {StringType.class}, order=2, min=0, max=1)
-        @Description(shortDefinition="Short human label", formalDefinition="Used to label the constraint in OCL or in short displays incapable of displaying the full human description." )
-        protected StringType name;
+        @Child(name = "requirements", type = {StringType.class}, order=2, min=0, max=1)
+        @Description(shortDefinition="Why this constraint necessary or appropriate", formalDefinition="Description of why this constraint is necessary or appropriate." )
+        protected StringType requirements;
 
         /**
          * Identifies the impact constraint violation has on the conformance of the instance.
@@ -1013,7 +922,7 @@ public class ElementDefinition extends Type implements ICompositeType {
         @Description(shortDefinition="XPath expression of constraint", formalDefinition="An XPath expression of constraint that can be executed to see if this constraint is met." )
         protected StringType xpath;
 
-        private static final long serialVersionUID = -1195616532L;
+        private static final long serialVersionUID = 854521265L;
 
     /*
      * Constructor
@@ -1079,50 +988,50 @@ public class ElementDefinition extends Type implements ICompositeType {
         }
 
         /**
-         * @return {@link #name} (Used to label the constraint in OCL or in short displays incapable of displaying the full human description.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+         * @return {@link #requirements} (Description of why this constraint is necessary or appropriate.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
          */
-        public StringType getNameElement() { 
-          if (this.name == null)
+        public StringType getRequirementsElement() { 
+          if (this.requirements == null)
             if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create ElementDefinitionConstraintComponent.name");
+              throw new Error("Attempt to auto-create ElementDefinitionConstraintComponent.requirements");
             else if (Configuration.doAutoCreate())
-              this.name = new StringType(); // bb
-          return this.name;
+              this.requirements = new StringType(); // bb
+          return this.requirements;
         }
 
-        public boolean hasNameElement() { 
-          return this.name != null && !this.name.isEmpty();
+        public boolean hasRequirementsElement() { 
+          return this.requirements != null && !this.requirements.isEmpty();
         }
 
-        public boolean hasName() { 
-          return this.name != null && !this.name.isEmpty();
+        public boolean hasRequirements() { 
+          return this.requirements != null && !this.requirements.isEmpty();
         }
 
         /**
-         * @param value {@link #name} (Used to label the constraint in OCL or in short displays incapable of displaying the full human description.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+         * @param value {@link #requirements} (Description of why this constraint is necessary or appropriate.). This is the underlying object with id, value and extensions. The accessor "getRequirements" gives direct access to the value
          */
-        public ElementDefinitionConstraintComponent setNameElement(StringType value) { 
-          this.name = value;
+        public ElementDefinitionConstraintComponent setRequirementsElement(StringType value) { 
+          this.requirements = value;
           return this;
         }
 
         /**
-         * @return Used to label the constraint in OCL or in short displays incapable of displaying the full human description.
+         * @return Description of why this constraint is necessary or appropriate.
          */
-        public String getName() { 
-          return this.name == null ? null : this.name.getValue();
+        public String getRequirements() { 
+          return this.requirements == null ? null : this.requirements.getValue();
         }
 
         /**
-         * @param value Used to label the constraint in OCL or in short displays incapable of displaying the full human description.
+         * @param value Description of why this constraint is necessary or appropriate.
          */
-        public ElementDefinitionConstraintComponent setName(String value) { 
+        public ElementDefinitionConstraintComponent setRequirements(String value) { 
           if (Utilities.noString(value))
-            this.name = null;
+            this.requirements = null;
           else {
-            if (this.name == null)
-              this.name = new StringType();
-            this.name.setValue(value);
+            if (this.requirements == null)
+              this.requirements = new StringType();
+            this.requirements.setValue(value);
           }
           return this;
         }
@@ -1265,7 +1174,7 @@ public class ElementDefinition extends Type implements ICompositeType {
         protected void listChildren(List<Property> childrenList) {
           super.listChildren(childrenList);
           childrenList.add(new Property("key", "id", "Allows identification of which elements have their cardinalities impacted by the constraint.  Will not be referenced for constraints that do not affect cardinality.", 0, java.lang.Integer.MAX_VALUE, key));
-          childrenList.add(new Property("name", "string", "Used to label the constraint in OCL or in short displays incapable of displaying the full human description.", 0, java.lang.Integer.MAX_VALUE, name));
+          childrenList.add(new Property("requirements", "string", "Description of why this constraint is necessary or appropriate.", 0, java.lang.Integer.MAX_VALUE, requirements));
           childrenList.add(new Property("severity", "code", "Identifies the impact constraint violation has on the conformance of the instance.", 0, java.lang.Integer.MAX_VALUE, severity));
           childrenList.add(new Property("human", "string", "Text that can be used to describe the constraint in messages identifying that the constraint has been violated.", 0, java.lang.Integer.MAX_VALUE, human));
           childrenList.add(new Property("xpath", "string", "An XPath expression of constraint that can be executed to see if this constraint is met.", 0, java.lang.Integer.MAX_VALUE, xpath));
@@ -1275,7 +1184,7 @@ public class ElementDefinition extends Type implements ICompositeType {
         ElementDefinitionConstraintComponent dst = new ElementDefinitionConstraintComponent();
         copyValues(dst);
         dst.key = key == null ? null : key.copy();
-        dst.name = name == null ? null : name.copy();
+        dst.requirements = requirements == null ? null : requirements.copy();
         dst.severity = severity == null ? null : severity.copy();
         dst.human = human == null ? null : human.copy();
         dst.xpath = xpath == null ? null : xpath.copy();
@@ -1289,7 +1198,7 @@ public class ElementDefinition extends Type implements ICompositeType {
         if (!(other instanceof ElementDefinitionConstraintComponent))
           return false;
         ElementDefinitionConstraintComponent o = (ElementDefinitionConstraintComponent) other;
-        return compareDeep(key, o.key, true) && compareDeep(name, o.name, true) && compareDeep(severity, o.severity, true)
+        return compareDeep(key, o.key, true) && compareDeep(requirements, o.requirements, true) && compareDeep(severity, o.severity, true)
            && compareDeep(human, o.human, true) && compareDeep(xpath, o.xpath, true);
       }
 
@@ -1300,12 +1209,12 @@ public class ElementDefinition extends Type implements ICompositeType {
         if (!(other instanceof ElementDefinitionConstraintComponent))
           return false;
         ElementDefinitionConstraintComponent o = (ElementDefinitionConstraintComponent) other;
-        return compareValues(key, o.key, true) && compareValues(name, o.name, true) && compareValues(severity, o.severity, true)
+        return compareValues(key, o.key, true) && compareValues(requirements, o.requirements, true) && compareValues(severity, o.severity, true)
            && compareValues(human, o.human, true) && compareValues(xpath, o.xpath, true);
       }
 
       public boolean isEmpty() {
-        return super.isEmpty() && (key == null || key.isEmpty()) && (name == null || name.isEmpty())
+        return super.isEmpty() && (key == null || key.isEmpty()) && (requirements == null || requirements.isEmpty())
            && (severity == null || severity.isEmpty()) && (human == null || human.isEmpty()) && (xpath == null || xpath.isEmpty())
           ;
       }
@@ -1317,7 +1226,7 @@ public class ElementDefinition extends Type implements ICompositeType {
         /**
          * A descriptive name for this - can be useful for generating implementation artifacts.
          */
-        @Child(name = "name", type = {StringType.class}, order=1, min=1, max=1)
+        @Child(name = "name", type = {StringType.class}, order=1, min=0, max=1)
         @Description(shortDefinition="Descriptive Name", formalDefinition="A descriptive name for this - can be useful for generating implementation artifacts." )
         protected StringType name;
 
@@ -1354,9 +1263,8 @@ public class ElementDefinition extends Type implements ICompositeType {
     /*
      * Constructor
      */
-      public ElementDefinitionBindingComponent(StringType name, Enumeration<BindingStrength> strength) {
+      public ElementDefinitionBindingComponent(Enumeration<BindingStrength> strength) {
         super();
-        this.name = name;
         this.strength = strength;
       }
 
@@ -1399,9 +1307,13 @@ public class ElementDefinition extends Type implements ICompositeType {
          * @param value A descriptive name for this - can be useful for generating implementation artifacts.
          */
         public ElementDefinitionBindingComponent setName(String value) { 
+          if (Utilities.noString(value))
+            this.name = null;
+          else {
             if (this.name == null)
               this.name = new StringType();
             this.name.setValue(value);
+          }
           return this;
         }
 
@@ -1515,6 +1427,10 @@ public class ElementDefinition extends Type implements ICompositeType {
           return (UriType) this.valueSet;
         }
 
+        public boolean hasValueSetUriType() throws Exception { 
+          return this.valueSet instanceof UriType;
+        }
+
         /**
          * @return {@link #valueSet} (Points to the value set or external definition (e.g. implicit value set) that identifies the set of codes to be used.)
          */
@@ -1524,6 +1440,10 @@ public class ElementDefinition extends Type implements ICompositeType {
           return (Reference) this.valueSet;
         }
 
+        public boolean hasValueSetReference() throws Exception { 
+          return this.valueSet instanceof Reference;
+        }
+
         public boolean hasValueSet() { 
           return this.valueSet != null && !this.valueSet.isEmpty();
         }
@@ -1854,7 +1774,7 @@ public class ElementDefinition extends Type implements ICompositeType {
     /**
      * A concise definition that  is shown in the generated XML format that summarizes profiles (used throughout the specification).
      */
-    @Child(name = "short", type = {StringType.class}, order=6, min=0, max=1)
+    @Child(name = "short_", type = {StringType.class}, order=6, min=0, max=1)
     @Description(shortDefinition="Concise definition for xml presentation", formalDefinition="A concise definition that  is shown in the generated XML format that summarizes profiles (used throughout the specification)." )
     protected StringType short_;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -105,12 +105,12 @@ public class Encounter extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PLANNED: return "http://hl7.org.fhir/encounter-state";
-            case ARRIVED: return "http://hl7.org.fhir/encounter-state";
-            case INPROGRESS: return "http://hl7.org.fhir/encounter-state";
-            case ONLEAVE: return "http://hl7.org.fhir/encounter-state";
-            case FINISHED: return "http://hl7.org.fhir/encounter-state";
-            case CANCELLED: return "http://hl7.org.fhir/encounter-state";
+            case PLANNED: return "http://hl7.org/fhir/encounter-state";
+            case ARRIVED: return "http://hl7.org/fhir/encounter-state";
+            case INPROGRESS: return "http://hl7.org/fhir/encounter-state";
+            case ONLEAVE: return "http://hl7.org/fhir/encounter-state";
+            case FINISHED: return "http://hl7.org/fhir/encounter-state";
+            case CANCELLED: return "http://hl7.org/fhir/encounter-state";
             default: return "?";
           }
         }
@@ -254,15 +254,15 @@ public class Encounter extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case INPATIENT: return "http://hl7.org.fhir/encounter-class";
-            case OUTPATIENT: return "http://hl7.org.fhir/encounter-class";
-            case AMBULATORY: return "http://hl7.org.fhir/encounter-class";
-            case EMERGENCY: return "http://hl7.org.fhir/encounter-class";
-            case HOME: return "http://hl7.org.fhir/encounter-class";
-            case FIELD: return "http://hl7.org.fhir/encounter-class";
-            case DAYTIME: return "http://hl7.org.fhir/encounter-class";
-            case VIRTUAL: return "http://hl7.org.fhir/encounter-class";
-            case OTHER: return "http://hl7.org.fhir/encounter-class";
+            case INPATIENT: return "http://hl7.org/fhir/encounter-class";
+            case OUTPATIENT: return "http://hl7.org/fhir/encounter-class";
+            case AMBULATORY: return "http://hl7.org/fhir/encounter-class";
+            case EMERGENCY: return "http://hl7.org/fhir/encounter-class";
+            case HOME: return "http://hl7.org/fhir/encounter-class";
+            case FIELD: return "http://hl7.org/fhir/encounter-class";
+            case DAYTIME: return "http://hl7.org/fhir/encounter-class";
+            case VIRTUAL: return "http://hl7.org/fhir/encounter-class";
+            case OTHER: return "http://hl7.org/fhir/encounter-class";
             default: return "?";
           }
         }
@@ -382,9 +382,9 @@ public class Encounter extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PLANNED: return "http://hl7.org.fhir/encounter-location-status";
-            case PRESENT: return "http://hl7.org.fhir/encounter-location-status";
-            case RESERVED: return "http://hl7.org.fhir/encounter-location-status";
+            case PLANNED: return "http://hl7.org/fhir/encounter-location-status";
+            case PRESENT: return "http://hl7.org/fhir/encounter-location-status";
+            case RESERVED: return "http://hl7.org/fhir/encounter-location-status";
             default: return "?";
           }
         }
@@ -790,31 +790,50 @@ public class Encounter extends DomainResource {
         @Description(shortDefinition="From where patient was admitted (physician referral, transfer)", formalDefinition="From where patient was admitted (physician referral, transfer)." )
         protected CodeableConcept admitSource;
 
+        /**
+         * The admitting Diagnosis field is used to record the diagnosis codes as reported by admitting practitioner. This could be different or in addition to the conditions reported as reason-condition(s) for the encounter.
+         */
+        @Child(name = "admittingDiagnosis", type = {Condition.class}, order=4, min=0, max=Child.MAX_UNLIMITED)
+        @Description(shortDefinition="The admitting Diagnosis as reported by admitting practitioner", formalDefinition="The admitting Diagnosis field is used to record the diagnosis codes as reported by admitting practitioner. This could be different or in addition to the conditions reported as reason-condition(s) for the encounter." )
+        protected List<Reference> admittingDiagnosis;
+        /**
+         * The actual objects that are the target of the reference (The admitting Diagnosis field is used to record the diagnosis codes as reported by admitting practitioner. This could be different or in addition to the conditions reported as reason-condition(s) for the encounter.)
+         */
+        protected List<Condition> admittingDiagnosisTarget;
+
+
+        /**
+         * Whether this hospitalization is a readmission and why if known.
+         */
+        @Child(name = "reAdmission", type = {CodeableConcept.class}, order=5, min=0, max=1)
+        @Description(shortDefinition="The type of hospital re-admission that has occurred (if any). If the value is absent, then this is not identified as a readmission", formalDefinition="Whether this hospitalization is a readmission and why if known." )
+        protected CodeableConcept reAdmission;
+
         /**
          * Diet preferences reported by the patient.
          */
-        @Child(name = "dietPreference", type = {CodeableConcept.class}, order=4, min=0, max=1)
+        @Child(name = "dietPreference", type = {CodeableConcept.class}, order=6, min=0, max=Child.MAX_UNLIMITED)
         @Description(shortDefinition="Diet preferences reported by the patient", formalDefinition="Diet preferences reported by the patient." )
-        protected CodeableConcept dietPreference;
+        protected List<CodeableConcept> dietPreference;
 
         /**
          * Special courtesies (VIP, board member).
          */
-        @Child(name = "specialCourtesy", type = {CodeableConcept.class}, order=5, min=0, max=Child.MAX_UNLIMITED)
+        @Child(name = "specialCourtesy", type = {CodeableConcept.class}, order=7, min=0, max=Child.MAX_UNLIMITED)
         @Description(shortDefinition="Special courtesies (VIP, board member)", formalDefinition="Special courtesies (VIP, board member)." )
         protected List<CodeableConcept> specialCourtesy;
 
         /**
          * Wheelchair, translator, stretcher, etc.
          */
-        @Child(name = "specialArrangement", type = {CodeableConcept.class}, order=6, min=0, max=Child.MAX_UNLIMITED)
+        @Child(name = "specialArrangement", type = {CodeableConcept.class}, order=8, min=0, max=Child.MAX_UNLIMITED)
         @Description(shortDefinition="Wheelchair, translator, stretcher, etc", formalDefinition="Wheelchair, translator, stretcher, etc." )
         protected List<CodeableConcept> specialArrangement;
 
         /**
          * Location to which the patient is discharged.
          */
-        @Child(name = "destination", type = {Location.class}, order=7, min=0, max=1)
+        @Child(name = "destination", type = {Location.class}, order=9, min=0, max=1)
         @Description(shortDefinition="Location to which the patient is discharged", formalDefinition="Location to which the patient is discharged." )
         protected Reference destination;
 
@@ -826,30 +845,23 @@ public class Encounter extends DomainResource {
         /**
          * Category or kind of location after discharge.
          */
-        @Child(name = "dischargeDisposition", type = {CodeableConcept.class}, order=8, min=0, max=1)
+        @Child(name = "dischargeDisposition", type = {CodeableConcept.class}, order=10, min=0, max=1)
         @Description(shortDefinition="Category or kind of location after discharge", formalDefinition="Category or kind of location after discharge." )
         protected CodeableConcept dischargeDisposition;
 
         /**
          * The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.
          */
-        @Child(name = "dischargeDiagnosis", type = {}, order=9, min=0, max=1)
+        @Child(name = "dischargeDiagnosis", type = {Condition.class}, order=11, min=0, max=Child.MAX_UNLIMITED)
         @Description(shortDefinition="The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete", formalDefinition="The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete." )
-        protected Reference dischargeDiagnosis;
-
+        protected List<Reference> dischargeDiagnosis;
         /**
-         * The actual object that is the target of the reference (The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.)
+         * The actual objects that are the target of the reference (The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.)
          */
-        protected Resource dischargeDiagnosisTarget;
+        protected List<Condition> dischargeDiagnosisTarget;
 
-        /**
-         * Whether this hospitalization is a readmission.
-         */
-        @Child(name = "reAdmission", type = {BooleanType.class}, order=10, min=0, max=1)
-        @Description(shortDefinition="Is this hospitalization a readmission?", formalDefinition="Whether this hospitalization is a readmission." )
-        protected BooleanType reAdmission;
 
-        private static final long serialVersionUID = -990619663L;
+        private static final long serialVersionUID = 164618034L;
 
     /*
      * Constructor
@@ -950,27 +962,128 @@ public class Encounter extends DomainResource {
           return this;
         }
 
+        /**
+         * @return {@link #admittingDiagnosis} (The admitting Diagnosis field is used to record the diagnosis codes as reported by admitting practitioner. This could be different or in addition to the conditions reported as reason-condition(s) for the encounter.)
+         */
+        public List<Reference> getAdmittingDiagnosis() { 
+          if (this.admittingDiagnosis == null)
+            this.admittingDiagnosis = new ArrayList<Reference>();
+          return this.admittingDiagnosis;
+        }
+
+        public boolean hasAdmittingDiagnosis() { 
+          if (this.admittingDiagnosis == null)
+            return false;
+          for (Reference item : this.admittingDiagnosis)
+            if (!item.isEmpty())
+              return true;
+          return false;
+        }
+
+        /**
+         * @return {@link #admittingDiagnosis} (The admitting Diagnosis field is used to record the diagnosis codes as reported by admitting practitioner. This could be different or in addition to the conditions reported as reason-condition(s) for the encounter.)
+         */
+    // syntactic sugar
+        public Reference addAdmittingDiagnosis() { //3
+          Reference t = new Reference();
+          if (this.admittingDiagnosis == null)
+            this.admittingDiagnosis = new ArrayList<Reference>();
+          this.admittingDiagnosis.add(t);
+          return t;
+        }
+
+    // syntactic sugar
+        public EncounterHospitalizationComponent addAdmittingDiagnosis(Reference t) { //3
+          if (t == null)
+            return this;
+          if (this.admittingDiagnosis == null)
+            this.admittingDiagnosis = new ArrayList<Reference>();
+          this.admittingDiagnosis.add(t);
+          return this;
+        }
+
+        /**
+         * @return {@link #admittingDiagnosis} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. The admitting Diagnosis field is used to record the diagnosis codes as reported by admitting practitioner. This could be different or in addition to the conditions reported as reason-condition(s) for the encounter.)
+         */
+        public List<Condition> getAdmittingDiagnosisTarget() { 
+          if (this.admittingDiagnosisTarget == null)
+            this.admittingDiagnosisTarget = new ArrayList<Condition>();
+          return this.admittingDiagnosisTarget;
+        }
+
+    // syntactic sugar
+        /**
+         * @return {@link #admittingDiagnosis} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. The admitting Diagnosis field is used to record the diagnosis codes as reported by admitting practitioner. This could be different or in addition to the conditions reported as reason-condition(s) for the encounter.)
+         */
+        public Condition addAdmittingDiagnosisTarget() { 
+          Condition r = new Condition();
+          if (this.admittingDiagnosisTarget == null)
+            this.admittingDiagnosisTarget = new ArrayList<Condition>();
+          this.admittingDiagnosisTarget.add(r);
+          return r;
+        }
+
+        /**
+         * @return {@link #reAdmission} (Whether this hospitalization is a readmission and why if known.)
+         */
+        public CodeableConcept getReAdmission() { 
+          if (this.reAdmission == null)
+            if (Configuration.errorOnAutoCreate())
+              throw new Error("Attempt to auto-create EncounterHospitalizationComponent.reAdmission");
+            else if (Configuration.doAutoCreate())
+              this.reAdmission = new CodeableConcept(); // cc
+          return this.reAdmission;
+        }
+
+        public boolean hasReAdmission() { 
+          return this.reAdmission != null && !this.reAdmission.isEmpty();
+        }
+
+        /**
+         * @param value {@link #reAdmission} (Whether this hospitalization is a readmission and why if known.)
+         */
+        public EncounterHospitalizationComponent setReAdmission(CodeableConcept value) { 
+          this.reAdmission = value;
+          return this;
+        }
+
         /**
          * @return {@link #dietPreference} (Diet preferences reported by the patient.)
          */
-        public CodeableConcept getDietPreference() { 
+        public List<CodeableConcept> getDietPreference() { 
           if (this.dietPreference == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create EncounterHospitalizationComponent.dietPreference");
-            else if (Configuration.doAutoCreate())
-              this.dietPreference = new CodeableConcept(); // cc
+            this.dietPreference = new ArrayList<CodeableConcept>();
           return this.dietPreference;
         }
 
         public boolean hasDietPreference() { 
-          return this.dietPreference != null && !this.dietPreference.isEmpty();
+          if (this.dietPreference == null)
+            return false;
+          for (CodeableConcept item : this.dietPreference)
+            if (!item.isEmpty())
+              return true;
+          return false;
         }
 
         /**
-         * @param value {@link #dietPreference} (Diet preferences reported by the patient.)
+         * @return {@link #dietPreference} (Diet preferences reported by the patient.)
          */
-        public EncounterHospitalizationComponent setDietPreference(CodeableConcept value) { 
-          this.dietPreference = value;
+    // syntactic sugar
+        public CodeableConcept addDietPreference() { //3
+          CodeableConcept t = new CodeableConcept();
+          if (this.dietPreference == null)
+            this.dietPreference = new ArrayList<CodeableConcept>();
+          this.dietPreference.add(t);
+          return t;
+        }
+
+    // syntactic sugar
+        public EncounterHospitalizationComponent addDietPreference(CodeableConcept t) { //3
+          if (t == null)
+            return this;
+          if (this.dietPreference == null)
+            this.dietPreference = new ArrayList<CodeableConcept>();
+          this.dietPreference.add(t);
           return this;
         }
 
@@ -1125,85 +1238,62 @@ public class Encounter extends DomainResource {
         /**
          * @return {@link #dischargeDiagnosis} (The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.)
          */
-        public Reference getDischargeDiagnosis() { 
+        public List<Reference> getDischargeDiagnosis() { 
           if (this.dischargeDiagnosis == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create EncounterHospitalizationComponent.dischargeDiagnosis");
-            else if (Configuration.doAutoCreate())
-              this.dischargeDiagnosis = new Reference(); // cc
+            this.dischargeDiagnosis = new ArrayList<Reference>();
           return this.dischargeDiagnosis;
         }
 
         public boolean hasDischargeDiagnosis() { 
-          return this.dischargeDiagnosis != null && !this.dischargeDiagnosis.isEmpty();
+          if (this.dischargeDiagnosis == null)
+            return false;
+          for (Reference item : this.dischargeDiagnosis)
+            if (!item.isEmpty())
+              return true;
+          return false;
         }
 
         /**
-         * @param value {@link #dischargeDiagnosis} (The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.)
+         * @return {@link #dischargeDiagnosis} (The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.)
          */
-        public EncounterHospitalizationComponent setDischargeDiagnosis(Reference value) { 
-          this.dischargeDiagnosis = value;
+    // syntactic sugar
+        public Reference addDischargeDiagnosis() { //3
+          Reference t = new Reference();
+          if (this.dischargeDiagnosis == null)
+            this.dischargeDiagnosis = new ArrayList<Reference>();
+          this.dischargeDiagnosis.add(t);
+          return t;
+        }
+
+    // syntactic sugar
+        public EncounterHospitalizationComponent addDischargeDiagnosis(Reference t) { //3
+          if (t == null)
+            return this;
+          if (this.dischargeDiagnosis == null)
+            this.dischargeDiagnosis = new ArrayList<Reference>();
+          this.dischargeDiagnosis.add(t);
           return this;
         }
 
         /**
-         * @return {@link #dischargeDiagnosis} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.)
+         * @return {@link #dischargeDiagnosis} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.)
          */
-        public Resource getDischargeDiagnosisTarget() { 
+        public List<Condition> getDischargeDiagnosisTarget() { 
+          if (this.dischargeDiagnosisTarget == null)
+            this.dischargeDiagnosisTarget = new ArrayList<Condition>();
           return this.dischargeDiagnosisTarget;
         }
 
+    // syntactic sugar
         /**
-         * @param value {@link #dischargeDiagnosis} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.)
+         * @return {@link #dischargeDiagnosis} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.)
          */
-        public EncounterHospitalizationComponent setDischargeDiagnosisTarget(Resource value) { 
-          this.dischargeDiagnosisTarget = value;
-          return this;
-        }
-
-        /**
-         * @return {@link #reAdmission} (Whether this hospitalization is a readmission.). This is the underlying object with id, value and extensions. The accessor "getReAdmission" gives direct access to the value
-         */
-        public BooleanType getReAdmissionElement() { 
-          if (this.reAdmission == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create EncounterHospitalizationComponent.reAdmission");
-            else if (Configuration.doAutoCreate())
-              this.reAdmission = new BooleanType(); // bb
-          return this.reAdmission;
-        }
-
-        public boolean hasReAdmissionElement() { 
-          return this.reAdmission != null && !this.reAdmission.isEmpty();
-        }
-
-        public boolean hasReAdmission() { 
-          return this.reAdmission != null && !this.reAdmission.isEmpty();
-        }
-
-        /**
-         * @param value {@link #reAdmission} (Whether this hospitalization is a readmission.). This is the underlying object with id, value and extensions. The accessor "getReAdmission" gives direct access to the value
-         */
-        public EncounterHospitalizationComponent setReAdmissionElement(BooleanType value) { 
-          this.reAdmission = value;
-          return this;
-        }
-
-        /**
-         * @return Whether this hospitalization is a readmission.
-         */
-        public boolean getReAdmission() { 
-          return this.reAdmission == null || this.reAdmission.isEmpty() ? false : this.reAdmission.getValue();
-        }
-
-        /**
-         * @param value Whether this hospitalization is a readmission.
-         */
-        public EncounterHospitalizationComponent setReAdmission(boolean value) { 
-            if (this.reAdmission == null)
-              this.reAdmission = new BooleanType();
-            this.reAdmission.setValue(value);
-          return this;
+        public Condition addDischargeDiagnosisTarget() { 
+          Condition r = new Condition();
+          if (this.dischargeDiagnosisTarget == null)
+            this.dischargeDiagnosisTarget = new ArrayList<Condition>();
+          this.dischargeDiagnosisTarget.add(r);
+          return r;
         }
 
         protected void listChildren(List<Property> childrenList) {
@@ -1211,13 +1301,14 @@ public class Encounter extends DomainResource {
           childrenList.add(new Property("preAdmissionIdentifier", "Identifier", "Pre-admission identifier.", 0, java.lang.Integer.MAX_VALUE, preAdmissionIdentifier));
           childrenList.add(new Property("origin", "Reference(Location)", "The location from which the patient came before admission.", 0, java.lang.Integer.MAX_VALUE, origin));
           childrenList.add(new Property("admitSource", "CodeableConcept", "From where patient was admitted (physician referral, transfer).", 0, java.lang.Integer.MAX_VALUE, admitSource));
+          childrenList.add(new Property("admittingDiagnosis", "Reference(Condition)", "The admitting Diagnosis field is used to record the diagnosis codes as reported by admitting practitioner. This could be different or in addition to the conditions reported as reason-condition(s) for the encounter.", 0, java.lang.Integer.MAX_VALUE, admittingDiagnosis));
+          childrenList.add(new Property("reAdmission", "CodeableConcept", "Whether this hospitalization is a readmission and why if known.", 0, java.lang.Integer.MAX_VALUE, reAdmission));
           childrenList.add(new Property("dietPreference", "CodeableConcept", "Diet preferences reported by the patient.", 0, java.lang.Integer.MAX_VALUE, dietPreference));
           childrenList.add(new Property("specialCourtesy", "CodeableConcept", "Special courtesies (VIP, board member).", 0, java.lang.Integer.MAX_VALUE, specialCourtesy));
           childrenList.add(new Property("specialArrangement", "CodeableConcept", "Wheelchair, translator, stretcher, etc.", 0, java.lang.Integer.MAX_VALUE, specialArrangement));
           childrenList.add(new Property("destination", "Reference(Location)", "Location to which the patient is discharged.", 0, java.lang.Integer.MAX_VALUE, destination));
           childrenList.add(new Property("dischargeDisposition", "CodeableConcept", "Category or kind of location after discharge.", 0, java.lang.Integer.MAX_VALUE, dischargeDisposition));
-          childrenList.add(new Property("dischargeDiagnosis", "Reference(Any)", "The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.", 0, java.lang.Integer.MAX_VALUE, dischargeDiagnosis));
-          childrenList.add(new Property("reAdmission", "boolean", "Whether this hospitalization is a readmission.", 0, java.lang.Integer.MAX_VALUE, reAdmission));
+          childrenList.add(new Property("dischargeDiagnosis", "Reference(Condition)", "The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete.", 0, java.lang.Integer.MAX_VALUE, dischargeDiagnosis));
         }
 
       public EncounterHospitalizationComponent copy() {
@@ -1226,7 +1317,17 @@ public class Encounter extends DomainResource {
         dst.preAdmissionIdentifier = preAdmissionIdentifier == null ? null : preAdmissionIdentifier.copy();
         dst.origin = origin == null ? null : origin.copy();
         dst.admitSource = admitSource == null ? null : admitSource.copy();
-        dst.dietPreference = dietPreference == null ? null : dietPreference.copy();
+        if (admittingDiagnosis != null) {
+          dst.admittingDiagnosis = new ArrayList<Reference>();
+          for (Reference i : admittingDiagnosis)
+            dst.admittingDiagnosis.add(i.copy());
+        };
+        dst.reAdmission = reAdmission == null ? null : reAdmission.copy();
+        if (dietPreference != null) {
+          dst.dietPreference = new ArrayList<CodeableConcept>();
+          for (CodeableConcept i : dietPreference)
+            dst.dietPreference.add(i.copy());
+        };
         if (specialCourtesy != null) {
           dst.specialCourtesy = new ArrayList<CodeableConcept>();
           for (CodeableConcept i : specialCourtesy)
@@ -1239,8 +1340,11 @@ public class Encounter extends DomainResource {
         };
         dst.destination = destination == null ? null : destination.copy();
         dst.dischargeDisposition = dischargeDisposition == null ? null : dischargeDisposition.copy();
-        dst.dischargeDiagnosis = dischargeDiagnosis == null ? null : dischargeDiagnosis.copy();
-        dst.reAdmission = reAdmission == null ? null : reAdmission.copy();
+        if (dischargeDiagnosis != null) {
+          dst.dischargeDiagnosis = new ArrayList<Reference>();
+          for (Reference i : dischargeDiagnosis)
+            dst.dischargeDiagnosis.add(i.copy());
+        };
         return dst;
       }
 
@@ -1252,11 +1356,11 @@ public class Encounter extends DomainResource {
           return false;
         EncounterHospitalizationComponent o = (EncounterHospitalizationComponent) other;
         return compareDeep(preAdmissionIdentifier, o.preAdmissionIdentifier, true) && compareDeep(origin, o.origin, true)
-           && compareDeep(admitSource, o.admitSource, true) && compareDeep(dietPreference, o.dietPreference, true)
+           && compareDeep(admitSource, o.admitSource, true) && compareDeep(admittingDiagnosis, o.admittingDiagnosis, true)
+           && compareDeep(reAdmission, o.reAdmission, true) && compareDeep(dietPreference, o.dietPreference, true)
            && compareDeep(specialCourtesy, o.specialCourtesy, true) && compareDeep(specialArrangement, o.specialArrangement, true)
            && compareDeep(destination, o.destination, true) && compareDeep(dischargeDisposition, o.dischargeDisposition, true)
-           && compareDeep(dischargeDiagnosis, o.dischargeDiagnosis, true) && compareDeep(reAdmission, o.reAdmission, true)
-          ;
+           && compareDeep(dischargeDiagnosis, o.dischargeDiagnosis, true);
       }
 
       @Override
@@ -1266,16 +1370,17 @@ public class Encounter extends DomainResource {
         if (!(other instanceof EncounterHospitalizationComponent))
           return false;
         EncounterHospitalizationComponent o = (EncounterHospitalizationComponent) other;
-        return compareValues(reAdmission, o.reAdmission, true);
+        return true;
       }
 
       public boolean isEmpty() {
         return super.isEmpty() && (preAdmissionIdentifier == null || preAdmissionIdentifier.isEmpty())
            && (origin == null || origin.isEmpty()) && (admitSource == null || admitSource.isEmpty())
+           && (admittingDiagnosis == null || admittingDiagnosis.isEmpty()) && (reAdmission == null || reAdmission.isEmpty())
            && (dietPreference == null || dietPreference.isEmpty()) && (specialCourtesy == null || specialCourtesy.isEmpty())
            && (specialArrangement == null || specialArrangement.isEmpty()) && (destination == null || destination.isEmpty())
            && (dischargeDisposition == null || dischargeDisposition.isEmpty()) && (dischargeDiagnosis == null || dischargeDiagnosis.isEmpty())
-           && (reAdmission == null || reAdmission.isEmpty());
+          ;
       }
 
   }
@@ -1510,7 +1615,7 @@ public class Encounter extends DomainResource {
     /**
      * inpatient | outpatient | ambulatory | emergency +.
      */
-    @Child(name = "class", type = {CodeType.class}, order=3, min=0, max=1)
+    @Child(name = "class_", type = {CodeType.class}, order=3, min=0, max=1)
     @Description(shortDefinition="inpatient | outpatient | ambulatory | emergency +", formalDefinition="inpatient | outpatient | ambulatory | emergency +." )
     protected Enumeration<EncounterClass> class_;
 
@@ -1534,25 +1639,29 @@ public class Encounter extends DomainResource {
     protected Patient patientTarget;
 
     /**
-     * Where a specific encounter should be classified as a part of a specific episode of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, or issue tracking.
+     * Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.
+
+The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).
      */
-    @Child(name = "episodeOfCare", type = {EpisodeOfCare.class}, order=6, min=0, max=1)
-    @Description(shortDefinition="An episode of care that this encounter should be recorded against", formalDefinition="Where a specific encounter should be classified as a part of a specific episode of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, or issue tracking." )
-    protected Reference episodeOfCare;
+    @Child(name = "episodeOfCare", type = {EpisodeOfCare.class}, order=6, min=0, max=Child.MAX_UNLIMITED)
+    @Description(shortDefinition="Episode(s) of care that this encounter should be recorded against", formalDefinition="Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.\n\nThe association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years)." )
+    protected List<Reference> episodeOfCare;
+    /**
+     * The actual objects that are the target of the reference (Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.
+
+The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).)
+     */
+    protected List<EpisodeOfCare> episodeOfCareTarget;
+
 
     /**
-     * The actual object that is the target of the reference (Where a specific encounter should be classified as a part of a specific episode of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, or issue tracking.)
-     */
-    protected EpisodeOfCare episodeOfCareTarget;
-
-    /**
-     * The referral request that this encounter is satisfies (incoming referral).
+     * The referral request that this encounter satisfies (incoming referral).
      */
     @Child(name = "incomingReferralRequest", type = {ReferralRequest.class}, order=7, min=0, max=Child.MAX_UNLIMITED)
-    @Description(shortDefinition="Incoming Referral Request", formalDefinition="The referral request that this encounter is satisfies (incoming referral)." )
+    @Description(shortDefinition="Incoming Referral Request", formalDefinition="The referral request that this encounter satisfies (incoming referral)." )
     protected List<Reference> incomingReferralRequest;
     /**
-     * The actual objects that are the target of the reference (The referral request that this encounter is satisfies (incoming referral).)
+     * The actual objects that are the target of the reference (The referral request that this encounter satisfies (incoming referral).)
      */
     protected List<ReferralRequest> incomingReferralRequestTarget;
 
@@ -1656,7 +1765,7 @@ The indication will typically be a Condition (with other resources referenced in
      */
     protected Encounter partOfTarget;
 
-    private static final long serialVersionUID = 413573588L;
+    private static final long serialVersionUID = 254412792L;
 
   /*
    * Constructor
@@ -1932,51 +2041,76 @@ The indication will typically be a Condition (with other resources referenced in
     }
 
     /**
-     * @return {@link #episodeOfCare} (Where a specific encounter should be classified as a part of a specific episode of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, or issue tracking.)
+     * @return {@link #episodeOfCare} (Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.
+
+The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).)
      */
-    public Reference getEpisodeOfCare() { 
+    public List<Reference> getEpisodeOfCare() { 
       if (this.episodeOfCare == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create Encounter.episodeOfCare");
-        else if (Configuration.doAutoCreate())
-          this.episodeOfCare = new Reference(); // cc
+        this.episodeOfCare = new ArrayList<Reference>();
       return this.episodeOfCare;
     }
 
     public boolean hasEpisodeOfCare() { 
-      return this.episodeOfCare != null && !this.episodeOfCare.isEmpty();
+      if (this.episodeOfCare == null)
+        return false;
+      for (Reference item : this.episodeOfCare)
+        if (!item.isEmpty())
+          return true;
+      return false;
     }
 
     /**
-     * @param value {@link #episodeOfCare} (Where a specific encounter should be classified as a part of a specific episode of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, or issue tracking.)
+     * @return {@link #episodeOfCare} (Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.
+
+The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).)
      */
-    public Encounter setEpisodeOfCare(Reference value) { 
-      this.episodeOfCare = value;
+    // syntactic sugar
+    public Reference addEpisodeOfCare() { //3
+      Reference t = new Reference();
+      if (this.episodeOfCare == null)
+        this.episodeOfCare = new ArrayList<Reference>();
+      this.episodeOfCare.add(t);
+      return t;
+    }
+
+    // syntactic sugar
+    public Encounter addEpisodeOfCare(Reference t) { //3
+      if (t == null)
+        return this;
+      if (this.episodeOfCare == null)
+        this.episodeOfCare = new ArrayList<Reference>();
+      this.episodeOfCare.add(t);
       return this;
     }
 
     /**
-     * @return {@link #episodeOfCare} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Where a specific encounter should be classified as a part of a specific episode of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, or issue tracking.)
+     * @return {@link #episodeOfCare} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.
+
+The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).)
      */
-    public EpisodeOfCare getEpisodeOfCareTarget() { 
+    public List<EpisodeOfCare> getEpisodeOfCareTarget() { 
       if (this.episodeOfCareTarget == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create Encounter.episodeOfCare");
-        else if (Configuration.doAutoCreate())
-          this.episodeOfCareTarget = new EpisodeOfCare(); // aa
+        this.episodeOfCareTarget = new ArrayList<EpisodeOfCare>();
       return this.episodeOfCareTarget;
     }
 
+    // syntactic sugar
     /**
-     * @param value {@link #episodeOfCare} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Where a specific encounter should be classified as a part of a specific episode of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, or issue tracking.)
+     * @return {@link #episodeOfCare} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.
+
+The association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).)
      */
-    public Encounter setEpisodeOfCareTarget(EpisodeOfCare value) { 
-      this.episodeOfCareTarget = value;
-      return this;
+    public EpisodeOfCare addEpisodeOfCareTarget() { 
+      EpisodeOfCare r = new EpisodeOfCare();
+      if (this.episodeOfCareTarget == null)
+        this.episodeOfCareTarget = new ArrayList<EpisodeOfCare>();
+      this.episodeOfCareTarget.add(r);
+      return r;
     }
 
     /**
-     * @return {@link #incomingReferralRequest} (The referral request that this encounter is satisfies (incoming referral).)
+     * @return {@link #incomingReferralRequest} (The referral request that this encounter satisfies (incoming referral).)
      */
     public List<Reference> getIncomingReferralRequest() { 
       if (this.incomingReferralRequest == null)
@@ -1994,7 +2128,7 @@ The indication will typically be a Condition (with other resources referenced in
     }
 
     /**
-     * @return {@link #incomingReferralRequest} (The referral request that this encounter is satisfies (incoming referral).)
+     * @return {@link #incomingReferralRequest} (The referral request that this encounter satisfies (incoming referral).)
      */
     // syntactic sugar
     public Reference addIncomingReferralRequest() { //3
@@ -2016,7 +2150,7 @@ The indication will typically be a Condition (with other resources referenced in
     }
 
     /**
-     * @return {@link #incomingReferralRequest} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. The referral request that this encounter is satisfies (incoming referral).)
+     * @return {@link #incomingReferralRequest} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. The referral request that this encounter satisfies (incoming referral).)
      */
     public List<ReferralRequest> getIncomingReferralRequestTarget() { 
       if (this.incomingReferralRequestTarget == null)
@@ -2026,7 +2160,7 @@ The indication will typically be a Condition (with other resources referenced in
 
     // syntactic sugar
     /**
-     * @return {@link #incomingReferralRequest} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. The referral request that this encounter is satisfies (incoming referral).)
+     * @return {@link #incomingReferralRequest} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. The referral request that this encounter satisfies (incoming referral).)
      */
     public ReferralRequest addIncomingReferralRequestTarget() { 
       ReferralRequest r = new ReferralRequest();
@@ -2444,8 +2578,8 @@ The indication will typically be a Condition (with other resources referenced in
         childrenList.add(new Property("class", "code", "inpatient | outpatient | ambulatory | emergency +.", 0, java.lang.Integer.MAX_VALUE, class_));
         childrenList.add(new Property("type", "CodeableConcept", "Specific type of encounter (e.g. e-mail consultation, surgical day-care, skilled nursing, rehabilitation).", 0, java.lang.Integer.MAX_VALUE, type));
         childrenList.add(new Property("patient", "Reference(Patient)", "The patient present at the encounter.", 0, java.lang.Integer.MAX_VALUE, patient));
-        childrenList.add(new Property("episodeOfCare", "Reference(EpisodeOfCare)", "Where a specific encounter should be classified as a part of a specific episode of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, or issue tracking.", 0, java.lang.Integer.MAX_VALUE, episodeOfCare));
-        childrenList.add(new Property("incomingReferralRequest", "Reference(ReferralRequest)", "The referral request that this encounter is satisfies (incoming referral).", 0, java.lang.Integer.MAX_VALUE, incomingReferralRequest));
+        childrenList.add(new Property("episodeOfCare", "Reference(EpisodeOfCare)", "Where a specific encounter should be classified as a part of a specific episode(s) of care this field should be used. This association can facilitate grouping of related encounters together for a specific purpose, such as govt reporting, issue tracking, association via a common problem.\n\nThe association is recorded on the encounter as these are typically created after the episode of care, and grouped on entry rather than editing the episode of care to append another encounter to it (the episode of care could span years).", 0, java.lang.Integer.MAX_VALUE, episodeOfCare));
+        childrenList.add(new Property("incomingReferralRequest", "Reference(ReferralRequest)", "The referral request that this encounter satisfies (incoming referral).", 0, java.lang.Integer.MAX_VALUE, incomingReferralRequest));
         childrenList.add(new Property("participant", "", "The main practitioner responsible for providing the service.", 0, java.lang.Integer.MAX_VALUE, participant));
         childrenList.add(new Property("fulfills", "Reference(Appointment)", "The appointment that scheduled this encounter.", 0, java.lang.Integer.MAX_VALUE, fulfills));
         childrenList.add(new Property("period", "Period", "The start and end time of the encounter.", 0, java.lang.Integer.MAX_VALUE, period));
@@ -2480,7 +2614,11 @@ The indication will typically be a Condition (with other resources referenced in
             dst.type.add(i.copy());
         };
         dst.patient = patient == null ? null : patient.copy();
-        dst.episodeOfCare = episodeOfCare == null ? null : episodeOfCare.copy();
+        if (episodeOfCare != null) {
+          dst.episodeOfCare = new ArrayList<Reference>();
+          for (Reference i : episodeOfCare)
+            dst.episodeOfCare.add(i.copy());
+        };
         if (incomingReferralRequest != null) {
           dst.incomingReferralRequest = new ArrayList<Reference>();
           for (Reference i : incomingReferralRequest)
@@ -2570,7 +2708,7 @@ The indication will typically be a Condition (with other resources referenced in
   public static final String SP_IDENTIFIER = "identifier";
   @SearchParamDefinition(name="reason", path="Encounter.reason", description="Reason the encounter takes place (code)", type="token" )
   public static final String SP_REASON = "reason";
-  @SearchParamDefinition(name="episodeofcare", path="Encounter.episodeOfCare", description="An episode of care that this encounter should be recorded against", type="reference" )
+  @SearchParamDefinition(name="episodeofcare", path="Encounter.episodeOfCare", description="Episode(s) of care that this encounter should be recorded against", type="reference" )
   public static final String SP_EPISODEOFCARE = "episodeofcare";
   @SearchParamDefinition(name="participant-type", path="Encounter.participant.type", description="Role of participant in encounter", type="token" )
   public static final String SP_PARTICIPANTTYPE = "participant-type";

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 
 import org.hl7.fhir.instance.model.api.*;
@@ -39,6 +39,7 @@ public class Enumerations {
 // In here: 
 //   AdministrativeGender: The gender of a person used for administrative purposes
 //   AgeUnits: A valueSet of UCUM codes for representing age value units
+//   BindingStrength: Indication of the degree of conformance expectations associated with a binding
 //   ConceptMapEquivalence: The degree of equivalence between concepts
 //   ConformanceResourceStatus: The lifecycle status of a Value Set or Concept Map
 //   DataAbsentReason: Used to specify why the normally expected content of the data element is missing
@@ -98,10 +99,10 @@ public class Enumerations {
         }
         public String getSystem() {
           switch (this) {
-            case MALE: return "http://hl7.org.fhir/administrative-gender";
-            case FEMALE: return "http://hl7.org.fhir/administrative-gender";
-            case OTHER: return "http://hl7.org.fhir/administrative-gender";
-            case UNKNOWN: return "http://hl7.org.fhir/administrative-gender";
+            case MALE: return "http://hl7.org/fhir/administrative-gender";
+            case FEMALE: return "http://hl7.org/fhir/administrative-gender";
+            case OTHER: return "http://hl7.org/fhir/administrative-gender";
+            case UNKNOWN: return "http://hl7.org/fhir/administrative-gender";
             default: return "?";
           }
         }
@@ -281,6 +282,106 @@ public class Enumerations {
       }
     }
 
+    public enum BindingStrength {
+        /**
+         * To be conformant, instances of this element SHALL include a code from the specified value set
+         */
+        REQUIRED, 
+        /**
+         * To be conformant, instances of this element SHALL include a code from the specified value set if any of the codes within the value set can apply to the concept being communicated.  If the valueset does not cover the concept (based on human review), alternate codings (or, data type allowing, text) may be included instead.
+         */
+        EXTENSIBLE, 
+        /**
+         * Instances are encouraged to draw from the specified codes for interoperability purposes but are not required to do so to be considered conformant
+         */
+        PREFERRED, 
+        /**
+         * Instances are not expected or even encouraged to draw from the specified value set.  The value set merely provides examples of the types of concepts intended to be included
+         */
+        EXAMPLE, 
+        /**
+         * added to help the parsers
+         */
+        NULL;
+        public static BindingStrength fromCode(String codeString) throws Exception {
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("required".equals(codeString))
+          return REQUIRED;
+        if ("extensible".equals(codeString))
+          return EXTENSIBLE;
+        if ("preferred".equals(codeString))
+          return PREFERRED;
+        if ("example".equals(codeString))
+          return EXAMPLE;
+        throw new Exception("Unknown BindingStrength code '"+codeString+"'");
+        }
+        public String toCode() {
+          switch (this) {
+            case REQUIRED: return "required";
+            case EXTENSIBLE: return "extensible";
+            case PREFERRED: return "preferred";
+            case EXAMPLE: return "example";
+            default: return "?";
+          }
+        }
+        public String getSystem() {
+          switch (this) {
+            case REQUIRED: return "http://hl7.org/fhir/binding-strength";
+            case EXTENSIBLE: return "http://hl7.org/fhir/binding-strength";
+            case PREFERRED: return "http://hl7.org/fhir/binding-strength";
+            case EXAMPLE: return "http://hl7.org/fhir/binding-strength";
+            default: return "?";
+          }
+        }
+        public String getDefinition() {
+          switch (this) {
+            case REQUIRED: return "To be conformant, instances of this element SHALL include a code from the specified value set";
+            case EXTENSIBLE: return "To be conformant, instances of this element SHALL include a code from the specified value set if any of the codes within the value set can apply to the concept being communicated.  If the valueset does not cover the concept (based on human review), alternate codings (or, data type allowing, text) may be included instead.";
+            case PREFERRED: return "Instances are encouraged to draw from the specified codes for interoperability purposes but are not required to do so to be considered conformant";
+            case EXAMPLE: return "Instances are not expected or even encouraged to draw from the specified value set.  The value set merely provides examples of the types of concepts intended to be included";
+            default: return "?";
+          }
+        }
+        public String getDisplay() {
+          switch (this) {
+            case REQUIRED: return "Required";
+            case EXTENSIBLE: return "Extensible";
+            case PREFERRED: return "Preferred";
+            case EXAMPLE: return "Example";
+            default: return "?";
+          }
+        }
+    }
+
+  public static class BindingStrengthEnumFactory implements EnumFactory<BindingStrength> {
+    public BindingStrength fromCode(String codeString) throws IllegalArgumentException {
+      if (codeString == null || "".equals(codeString))
+            if (codeString == null || "".equals(codeString))
+                return null;
+        if ("required".equals(codeString))
+          return BindingStrength.REQUIRED;
+        if ("extensible".equals(codeString))
+          return BindingStrength.EXTENSIBLE;
+        if ("preferred".equals(codeString))
+          return BindingStrength.PREFERRED;
+        if ("example".equals(codeString))
+          return BindingStrength.EXAMPLE;
+        throw new IllegalArgumentException("Unknown BindingStrength code '"+codeString+"'");
+        }
+    public String toCode(BindingStrength code) {
+      if (code == BindingStrength.REQUIRED)
+        return "required";
+      if (code == BindingStrength.EXTENSIBLE)
+        return "extensible";
+      if (code == BindingStrength.PREFERRED)
+        return "preferred";
+      if (code == BindingStrength.EXAMPLE)
+        return "example";
+      return "?";
+      }
+    }
+
     public enum ConceptMapEquivalence {
         /**
          * The definitions of the concepts mean the same thing (including when structural implications of meaning are considered) (i.e. extensionally identical)
@@ -303,9 +404,9 @@ public class Enumerations {
          */
         NARROWER, 
         /**
-         * The target mapping specialises the meaning of the source concept (e.g. the target is-a source)
+         * The target mapping specializes the meaning of the source concept (e.g. the target is-a source)
          */
-        SPECIALISES, 
+        SPECIALIZES, 
         /**
          * The target mapping overlaps with the source concept, but both source and target cover additional meaning, or the definitions are imprecise and it is uncertain whether they have the same boundaries to their meaning. The sense in which the mapping is narrower SHALL be described in the comments in this case, and applications should be careful when atempting to use these mappings operationally
          */
@@ -335,8 +436,8 @@ public class Enumerations {
           return SUBSUMES;
         if ("narrower".equals(codeString))
           return NARROWER;
-        if ("specialises".equals(codeString))
-          return SPECIALISES;
+        if ("specializes".equals(codeString))
+          return SPECIALIZES;
         if ("inexact".equals(codeString))
           return INEXACT;
         if ("unmatched".equals(codeString))
@@ -352,7 +453,7 @@ public class Enumerations {
             case WIDER: return "wider";
             case SUBSUMES: return "subsumes";
             case NARROWER: return "narrower";
-            case SPECIALISES: return "specialises";
+            case SPECIALIZES: return "specializes";
             case INEXACT: return "inexact";
             case UNMATCHED: return "unmatched";
             case DISJOINT: return "disjoint";
@@ -361,15 +462,15 @@ public class Enumerations {
         }
         public String getSystem() {
           switch (this) {
-            case EQUIVALENT: return "http://hl7.org.fhir/concept-map-equivalence";
-            case EQUAL: return "http://hl7.org.fhir/concept-map-equivalence";
-            case WIDER: return "http://hl7.org.fhir/concept-map-equivalence";
-            case SUBSUMES: return "http://hl7.org.fhir/concept-map-equivalence";
-            case NARROWER: return "http://hl7.org.fhir/concept-map-equivalence";
-            case SPECIALISES: return "http://hl7.org.fhir/concept-map-equivalence";
-            case INEXACT: return "http://hl7.org.fhir/concept-map-equivalence";
-            case UNMATCHED: return "http://hl7.org.fhir/concept-map-equivalence";
-            case DISJOINT: return "http://hl7.org.fhir/concept-map-equivalence";
+            case EQUIVALENT: return "http://hl7.org/fhir/concept-map-equivalence";
+            case EQUAL: return "http://hl7.org/fhir/concept-map-equivalence";
+            case WIDER: return "http://hl7.org/fhir/concept-map-equivalence";
+            case SUBSUMES: return "http://hl7.org/fhir/concept-map-equivalence";
+            case NARROWER: return "http://hl7.org/fhir/concept-map-equivalence";
+            case SPECIALIZES: return "http://hl7.org/fhir/concept-map-equivalence";
+            case INEXACT: return "http://hl7.org/fhir/concept-map-equivalence";
+            case UNMATCHED: return "http://hl7.org/fhir/concept-map-equivalence";
+            case DISJOINT: return "http://hl7.org/fhir/concept-map-equivalence";
             default: return "?";
           }
         }
@@ -380,7 +481,7 @@ public class Enumerations {
             case WIDER: return "The target mapping is wider in meaning than the source concept";
             case SUBSUMES: return "The target mapping subsumes the meaning of the source concept (e.g. the source is-a target)";
             case NARROWER: return "The target mapping is narrower in meaning that the source concept. The sense in which the mapping is narrower SHALL be described in the comments in this case, and applications should be careful when atempting to use these mappings operationally";
-            case SPECIALISES: return "The target mapping specialises the meaning of the source concept (e.g. the target is-a source)";
+            case SPECIALIZES: return "The target mapping specializes the meaning of the source concept (e.g. the target is-a source)";
             case INEXACT: return "The target mapping overlaps with the source concept, but both source and target cover additional meaning, or the definitions are imprecise and it is uncertain whether they have the same boundaries to their meaning. The sense in which the mapping is narrower SHALL be described in the comments in this case, and applications should be careful when atempting to use these mappings operationally";
             case UNMATCHED: return "There is no match for this concept in the destination concept system";
             case DISJOINT: return "This is an explicit assertion that there is no mapping between the source and target concept";
@@ -394,7 +495,7 @@ public class Enumerations {
             case WIDER: return "Wider";
             case SUBSUMES: return "Subsumes";
             case NARROWER: return "Narrower";
-            case SPECIALISES: return "Specialises";
+            case SPECIALIZES: return "Specializes";
             case INEXACT: return "Inexact";
             case UNMATCHED: return "Unmatched";
             case DISJOINT: return "Disjoint";
@@ -418,8 +519,8 @@ public class Enumerations {
           return ConceptMapEquivalence.SUBSUMES;
         if ("narrower".equals(codeString))
           return ConceptMapEquivalence.NARROWER;
-        if ("specialises".equals(codeString))
-          return ConceptMapEquivalence.SPECIALISES;
+        if ("specializes".equals(codeString))
+          return ConceptMapEquivalence.SPECIALIZES;
         if ("inexact".equals(codeString))
           return ConceptMapEquivalence.INEXACT;
         if ("unmatched".equals(codeString))
@@ -439,8 +540,8 @@ public class Enumerations {
         return "subsumes";
       if (code == ConceptMapEquivalence.NARROWER)
         return "narrower";
-      if (code == ConceptMapEquivalence.SPECIALISES)
-        return "specialises";
+      if (code == ConceptMapEquivalence.SPECIALIZES)
+        return "specializes";
       if (code == ConceptMapEquivalence.INEXACT)
         return "inexact";
       if (code == ConceptMapEquivalence.UNMATCHED)
@@ -461,7 +562,7 @@ public class Enumerations {
          */
         ACTIVE, 
         /**
-         * This resource has been withdrawn or superceded and should no longer be used
+         * This resource has been withdrawn or superseded and should no longer be used
          */
         RETIRED, 
         /**
@@ -489,9 +590,9 @@ public class Enumerations {
         }
         public String getSystem() {
           switch (this) {
-            case DRAFT: return "http://hl7.org.fhir/conformance-resource-status";
-            case ACTIVE: return "http://hl7.org.fhir/conformance-resource-status";
-            case RETIRED: return "http://hl7.org.fhir/conformance-resource-status";
+            case DRAFT: return "http://hl7.org/fhir/conformance-resource-status";
+            case ACTIVE: return "http://hl7.org/fhir/conformance-resource-status";
+            case RETIRED: return "http://hl7.org/fhir/conformance-resource-status";
             default: return "?";
           }
         }
@@ -499,7 +600,7 @@ public class Enumerations {
           switch (this) {
             case DRAFT: return "This resource is still under development";
             case ACTIVE: return "This resource is ready for normal use";
-            case RETIRED: return "This resource has been withdrawn or superceded and should no longer be used";
+            case RETIRED: return "This resource has been withdrawn or superseded and should no longer be used";
             default: return "?";
           }
         }
@@ -610,14 +711,14 @@ public class Enumerations {
         }
         public String getSystem() {
           switch (this) {
-            case UNKNOWN: return "http://hl7.org.fhir/data-absent-reason";
-            case ASKED: return "http://hl7.org.fhir/data-absent-reason";
-            case TEMP: return "http://hl7.org.fhir/data-absent-reason";
-            case NOTASKED: return "http://hl7.org.fhir/data-absent-reason";
-            case MASKED: return "http://hl7.org.fhir/data-absent-reason";
-            case UNSUPPORTED: return "http://hl7.org.fhir/data-absent-reason";
-            case ASTEXT: return "http://hl7.org.fhir/data-absent-reason";
-            case ERROR: return "http://hl7.org.fhir/data-absent-reason";
+            case UNKNOWN: return "http://hl7.org/fhir/data-absent-reason";
+            case ASKED: return "http://hl7.org/fhir/data-absent-reason";
+            case TEMP: return "http://hl7.org/fhir/data-absent-reason";
+            case NOTASKED: return "http://hl7.org/fhir/data-absent-reason";
+            case MASKED: return "http://hl7.org/fhir/data-absent-reason";
+            case UNSUPPORTED: return "http://hl7.org/fhir/data-absent-reason";
+            case ASTEXT: return "http://hl7.org/fhir/data-absent-reason";
+            case ERROR: return "http://hl7.org/fhir/data-absent-reason";
             default: return "?";
           }
         }
@@ -743,9 +844,9 @@ public class Enumerations {
          */
         CURRENT, 
         /**
-         * This reference has been superceded by another reference
+         * This reference has been superseded by another reference
          */
-        SUPERCEDED, 
+        SUPERSEDED, 
         /**
          * This reference was created in error
          */
@@ -759,8 +860,8 @@ public class Enumerations {
                 return null;
         if ("current".equals(codeString))
           return CURRENT;
-        if ("superceded".equals(codeString))
-          return SUPERCEDED;
+        if ("superseded".equals(codeString))
+          return SUPERSEDED;
         if ("entered-in-error".equals(codeString))
           return ENTEREDINERROR;
         throw new Exception("Unknown DocumentReferenceStatus code '"+codeString+"'");
@@ -768,23 +869,23 @@ public class Enumerations {
         public String toCode() {
           switch (this) {
             case CURRENT: return "current";
-            case SUPERCEDED: return "superceded";
+            case SUPERSEDED: return "superseded";
             case ENTEREDINERROR: return "entered-in-error";
             default: return "?";
           }
         }
         public String getSystem() {
           switch (this) {
-            case CURRENT: return "http://hl7.org.fhir/document-reference-status";
-            case SUPERCEDED: return "http://hl7.org.fhir/document-reference-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/document-reference-status";
+            case CURRENT: return "http://hl7.org/fhir/document-reference-status";
+            case SUPERSEDED: return "http://hl7.org/fhir/document-reference-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/document-reference-status";
             default: return "?";
           }
         }
         public String getDefinition() {
           switch (this) {
             case CURRENT: return "This is the current reference for this document";
-            case SUPERCEDED: return "This reference has been superceded by another reference";
+            case SUPERSEDED: return "This reference has been superseded by another reference";
             case ENTEREDINERROR: return "This reference was created in error";
             default: return "?";
           }
@@ -792,7 +893,7 @@ public class Enumerations {
         public String getDisplay() {
           switch (this) {
             case CURRENT: return "Current";
-            case SUPERCEDED: return "Superceded";
+            case SUPERSEDED: return "Superseded";
             case ENTEREDINERROR: return "Entered In Error";
             default: return "?";
           }
@@ -806,8 +907,8 @@ public class Enumerations {
                 return null;
         if ("current".equals(codeString))
           return DocumentReferenceStatus.CURRENT;
-        if ("superceded".equals(codeString))
-          return DocumentReferenceStatus.SUPERCEDED;
+        if ("superseded".equals(codeString))
+          return DocumentReferenceStatus.SUPERSEDED;
         if ("entered-in-error".equals(codeString))
           return DocumentReferenceStatus.ENTEREDINERROR;
         throw new IllegalArgumentException("Unknown DocumentReferenceStatus code '"+codeString+"'");
@@ -815,8 +916,8 @@ public class Enumerations {
     public String toCode(DocumentReferenceStatus code) {
       if (code == DocumentReferenceStatus.CURRENT)
         return "current";
-      if (code == DocumentReferenceStatus.SUPERCEDED)
-        return "superceded";
+      if (code == DocumentReferenceStatus.SUPERSEDED)
+        return "superseded";
       if (code == DocumentReferenceStatus.ENTEREDINERROR)
         return "entered-in-error";
       return "?";
@@ -949,9 +1050,9 @@ public class Enumerations {
         }
         public String getSystem() {
           switch (this) {
-            case DISPLAY: return "http://hl7.org.fhir/note-type";
-            case PRINT: return "http://hl7.org.fhir/note-type";
-            case PRINTOPER: return "http://hl7.org.fhir/note-type";
+            case DISPLAY: return "http://hl7.org/fhir/note-type";
+            case PRINT: return "http://hl7.org/fhir/note-type";
+            case PRINTOPER: return "http://hl7.org/fhir/note-type";
             default: return "?";
           }
         }
@@ -1028,8 +1129,8 @@ public class Enumerations {
         }
         public String getSystem() {
           switch (this) {
-            case COMPLETE: return "http://hl7.org.fhir/remittance-outcome";
-            case ERROR: return "http://hl7.org.fhir/remittance-outcome";
+            case COMPLETE: return "http://hl7.org/fhir/remittance-outcome";
+            case ERROR: return "http://hl7.org/fhir/remittance-outcome";
             default: return "?";
           }
         }
@@ -1186,14 +1287,14 @@ public class Enumerations {
         }
         public String getSystem() {
           switch (this) {
-            case NUMBER: return "http://hl7.org.fhir/search-param-type";
-            case DATE: return "http://hl7.org.fhir/search-param-type";
-            case STRING: return "http://hl7.org.fhir/search-param-type";
-            case TOKEN: return "http://hl7.org.fhir/search-param-type";
-            case REFERENCE: return "http://hl7.org.fhir/search-param-type";
-            case COMPOSITE: return "http://hl7.org.fhir/search-param-type";
-            case QUANTITY: return "http://hl7.org.fhir/search-param-type";
-            case URI: return "http://hl7.org.fhir/search-param-type";
+            case NUMBER: return "http://hl7.org/fhir/search-param-type";
+            case DATE: return "http://hl7.org/fhir/search-param-type";
+            case STRING: return "http://hl7.org/fhir/search-param-type";
+            case TOKEN: return "http://hl7.org/fhir/search-param-type";
+            case REFERENCE: return "http://hl7.org/fhir/search-param-type";
+            case COMPOSITE: return "http://hl7.org/fhir/search-param-type";
+            case QUANTITY: return "http://hl7.org/fhir/search-param-type";
+            case URI: return "http://hl7.org/fhir/search-param-type";
             default: return "?";
           }
         }
@@ -1328,12 +1429,12 @@ public class Enumerations {
         }
         public String getSystem() {
           switch (this) {
-            case TRUE: return "http://hl7.org.fhir/special-values";
-            case FALSE: return "http://hl7.org.fhir/special-values";
-            case TRACE: return "http://hl7.org.fhir/special-values";
-            case SUFFICIENT: return "http://hl7.org.fhir/special-values";
-            case WITHDRAWN: return "http://hl7.org.fhir/special-values";
-            case NILKNOWN: return "http://hl7.org.fhir/special-values";
+            case TRUE: return "http://hl7.org/fhir/special-values";
+            case FALSE: return "http://hl7.org/fhir/special-values";
+            case TRACE: return "http://hl7.org/fhir/special-values";
+            case SUFFICIENT: return "http://hl7.org/fhir/special-values";
+            case WITHDRAWN: return "http://hl7.org/fhir/special-values";
+            case NILKNOWN: return "http://hl7.org/fhir/special-values";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -105,12 +105,12 @@ public class EpisodeOfCare extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PLANNED: return "http://hl7.org.fhir/episode-of-care-status";
-            case WAITLIST: return "http://hl7.org.fhir/episode-of-care-status";
-            case ACTIVE: return "http://hl7.org.fhir/episode-of-care-status";
-            case ONHOLD: return "http://hl7.org.fhir/episode-of-care-status";
-            case FINISHED: return "http://hl7.org.fhir/episode-of-care-status";
-            case CANCELLED: return "http://hl7.org.fhir/episode-of-care-status";
+            case PLANNED: return "http://hl7.org/fhir/episode-of-care-status";
+            case WAITLIST: return "http://hl7.org/fhir/episode-of-care-status";
+            case ACTIVE: return "http://hl7.org/fhir/episode-of-care-status";
+            case ONHOLD: return "http://hl7.org/fhir/episode-of-care-status";
+            case FINISHED: return "http://hl7.org/fhir/episode-of-care-status";
+            case CANCELLED: return "http://hl7.org/fhir/episode-of-care-status";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -158,6 +158,10 @@ public class FamilyMemberHistory extends DomainResource {
           return (Age) this.onset;
         }
 
+        public boolean hasOnsetAge() throws Exception { 
+          return this.onset instanceof Age;
+        }
+
         /**
          * @return {@link #onset} (Either the age of onset, range of approximate age or descriptive string can be recorded.  For conditions with multiple occurrences, this describes the first known occurrence.)
          */
@@ -167,6 +171,10 @@ public class FamilyMemberHistory extends DomainResource {
           return (Range) this.onset;
         }
 
+        public boolean hasOnsetRange() throws Exception { 
+          return this.onset instanceof Range;
+        }
+
         /**
          * @return {@link #onset} (Either the age of onset, range of approximate age or descriptive string can be recorded.  For conditions with multiple occurrences, this describes the first known occurrence.)
          */
@@ -176,6 +184,10 @@ public class FamilyMemberHistory extends DomainResource {
           return (StringType) this.onset;
         }
 
+        public boolean hasOnsetStringType() throws Exception { 
+          return this.onset instanceof StringType;
+        }
+
         public boolean hasOnset() { 
           return this.onset != null && !this.onset.isEmpty();
         }
@@ -654,6 +666,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (Period) this.born;
     }
 
+    public boolean hasBornPeriod() throws Exception { 
+      return this.born instanceof Period;
+    }
+
     /**
      * @return {@link #born} (The actual or approximate date of birth of the relative.)
      */
@@ -663,6 +679,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (DateType) this.born;
     }
 
+    public boolean hasBornDateType() throws Exception { 
+      return this.born instanceof DateType;
+    }
+
     /**
      * @return {@link #born} (The actual or approximate date of birth of the relative.)
      */
@@ -672,6 +692,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (StringType) this.born;
     }
 
+    public boolean hasBornStringType() throws Exception { 
+      return this.born instanceof StringType;
+    }
+
     public boolean hasBorn() { 
       return this.born != null && !this.born.isEmpty();
     }
@@ -700,6 +724,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (Age) this.age;
     }
 
+    public boolean hasAgeAge() throws Exception { 
+      return this.age instanceof Age;
+    }
+
     /**
      * @return {@link #age} (The actual or approximate age of the relative at the time the family member history is recorded.)
      */
@@ -709,6 +737,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (Range) this.age;
     }
 
+    public boolean hasAgeRange() throws Exception { 
+      return this.age instanceof Range;
+    }
+
     /**
      * @return {@link #age} (The actual or approximate age of the relative at the time the family member history is recorded.)
      */
@@ -718,6 +750,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (StringType) this.age;
     }
 
+    public boolean hasAgeStringType() throws Exception { 
+      return this.age instanceof StringType;
+    }
+
     public boolean hasAge() { 
       return this.age != null && !this.age.isEmpty();
     }
@@ -746,6 +782,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (BooleanType) this.deceased;
     }
 
+    public boolean hasDeceasedBooleanType() throws Exception { 
+      return this.deceased instanceof BooleanType;
+    }
+
     /**
      * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.)
      */
@@ -755,6 +795,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (Age) this.deceased;
     }
 
+    public boolean hasDeceasedAge() throws Exception { 
+      return this.deceased instanceof Age;
+    }
+
     /**
      * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.)
      */
@@ -764,6 +808,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (Range) this.deceased;
     }
 
+    public boolean hasDeceasedRange() throws Exception { 
+      return this.deceased instanceof Range;
+    }
+
     /**
      * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.)
      */
@@ -773,6 +821,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (DateType) this.deceased;
     }
 
+    public boolean hasDeceasedDateType() throws Exception { 
+      return this.deceased instanceof DateType;
+    }
+
     /**
      * @return {@link #deceased} (The actual or approximate age of the relative at the time the family member history is recorded.)
      */
@@ -782,6 +834,10 @@ public class FamilyMemberHistory extends DomainResource {
       return (StringType) this.deceased;
     }
 
+    public boolean hasDeceasedStringType() throws Exception { 
+      return this.deceased instanceof StringType;
+    }
+
     public boolean hasDeceased() { 
       return this.deceased != null && !this.deceased.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -84,9 +84,9 @@ public class Flag extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case ACTIVE: return "http://hl7.org.fhir/flag-status";
-            case INACTIVE: return "http://hl7.org.fhir/flag-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/flag-status";
+            case ACTIVE: return "http://hl7.org/fhir/flag-status";
+            case INACTIVE: return "http://hl7.org/fhir/flag-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/flag-status";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -119,14 +119,14 @@ public class Goal extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PROPOSED: return "http://hl7.org.fhir/goal-status";
-            case PLANNED: return "http://hl7.org.fhir/goal-status";
-            case INPROGRESS: return "http://hl7.org.fhir/goal-status";
-            case ACHIEVED: return "http://hl7.org.fhir/goal-status";
-            case SUSTAINING: return "http://hl7.org.fhir/goal-status";
-            case CANCELLED: return "http://hl7.org.fhir/goal-status";
-            case ACCEPTED: return "http://hl7.org.fhir/goal-status";
-            case REJECTED: return "http://hl7.org.fhir/goal-status";
+            case PROPOSED: return "http://hl7.org/fhir/goal-status";
+            case PLANNED: return "http://hl7.org/fhir/goal-status";
+            case INPROGRESS: return "http://hl7.org/fhir/goal-status";
+            case ACHIEVED: return "http://hl7.org/fhir/goal-status";
+            case SUSTAINING: return "http://hl7.org/fhir/goal-status";
+            case CANCELLED: return "http://hl7.org/fhir/goal-status";
+            case ACCEPTED: return "http://hl7.org/fhir/goal-status";
+            case REJECTED: return "http://hl7.org/fhir/goal-status";
             default: return "?";
           }
         }
@@ -236,6 +236,10 @@ public class Goal extends DomainResource {
           return (CodeableConcept) this.result;
         }
 
+        public boolean hasResultCodeableConcept() throws Exception { 
+          return this.result instanceof CodeableConcept;
+        }
+
         /**
          * @return {@link #result} (Details of what's changed (or not changed).)
          */
@@ -245,6 +249,10 @@ public class Goal extends DomainResource {
           return (Reference) this.result;
         }
 
+        public boolean hasResultReference() throws Exception { 
+          return this.result instanceof Reference;
+        }
+
         public boolean hasResult() { 
           return this.result != null && !this.result.isEmpty();
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -105,12 +105,12 @@ public class Group extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PERSON: return "http://hl7.org.fhir/group-type";
-            case ANIMAL: return "http://hl7.org.fhir/group-type";
-            case PRACTITIONER: return "http://hl7.org.fhir/group-type";
-            case DEVICE: return "http://hl7.org.fhir/group-type";
-            case MEDICATION: return "http://hl7.org.fhir/group-type";
-            case SUBSTANCE: return "http://hl7.org.fhir/group-type";
+            case PERSON: return "http://hl7.org/fhir/group-type";
+            case ANIMAL: return "http://hl7.org/fhir/group-type";
+            case PRACTITIONER: return "http://hl7.org/fhir/group-type";
+            case DEVICE: return "http://hl7.org/fhir/group-type";
+            case MEDICATION: return "http://hl7.org/fhir/group-type";
+            case SUBSTANCE: return "http://hl7.org/fhir/group-type";
             default: return "?";
           }
         }
@@ -256,6 +256,10 @@ public class Group extends DomainResource {
           return (CodeableConcept) this.value;
         }
 
+        public boolean hasValueCodeableConcept() throws Exception { 
+          return this.value instanceof CodeableConcept;
+        }
+
         /**
          * @return {@link #value} (The value of the trait that holds (or does not hold - see 'exclude') for members of the group.)
          */
@@ -265,6 +269,10 @@ public class Group extends DomainResource {
           return (BooleanType) this.value;
         }
 
+        public boolean hasValueBooleanType() throws Exception { 
+          return this.value instanceof BooleanType;
+        }
+
         /**
          * @return {@link #value} (The value of the trait that holds (or does not hold - see 'exclude') for members of the group.)
          */
@@ -274,6 +282,10 @@ public class Group extends DomainResource {
           return (Quantity) this.value;
         }
 
+        public boolean hasValueQuantity() throws Exception { 
+          return this.value instanceof Quantity;
+        }
+
         /**
          * @return {@link #value} (The value of the trait that holds (or does not hold - see 'exclude') for members of the group.)
          */
@@ -283,6 +295,10 @@ public class Group extends DomainResource {
           return (Range) this.value;
         }
 
+        public boolean hasValueRange() throws Exception { 
+          return this.value instanceof Range;
+        }
+
         public boolean hasValue() { 
           return this.value != null && !this.value.isEmpty();
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -112,13 +112,13 @@ public class HealthcareService extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case MON: return "http://hl7.org.fhir/days-of-week";
-            case TUE: return "http://hl7.org.fhir/days-of-week";
-            case WED: return "http://hl7.org.fhir/days-of-week";
-            case THU: return "http://hl7.org.fhir/days-of-week";
-            case FRI: return "http://hl7.org.fhir/days-of-week";
-            case SAT: return "http://hl7.org.fhir/days-of-week";
-            case SUN: return "http://hl7.org.fhir/days-of-week";
+            case MON: return "http://hl7.org/fhir/days-of-week";
+            case TUE: return "http://hl7.org/fhir/days-of-week";
+            case WED: return "http://hl7.org/fhir/days-of-week";
+            case THU: return "http://hl7.org/fhir/days-of-week";
+            case FRI: return "http://hl7.org/fhir/days-of-week";
+            case SAT: return "http://hl7.org/fhir/days-of-week";
+            case SUN: return "http://hl7.org/fhir/days-of-week";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -111,13 +111,13 @@ public class HumanName extends Type implements ICompositeType {
         }
         public String getSystem() {
           switch (this) {
-            case USUAL: return "http://hl7.org.fhir/name-use";
-            case OFFICIAL: return "http://hl7.org.fhir/name-use";
-            case TEMP: return "http://hl7.org.fhir/name-use";
-            case NICKNAME: return "http://hl7.org.fhir/name-use";
-            case ANONYMOUS: return "http://hl7.org.fhir/name-use";
-            case OLD: return "http://hl7.org.fhir/name-use";
-            case MAIDEN: return "http://hl7.org.fhir/name-use";
+            case USUAL: return "http://hl7.org/fhir/name-use";
+            case OFFICIAL: return "http://hl7.org/fhir/name-use";
+            case TEMP: return "http://hl7.org/fhir/name-use";
+            case NICKNAME: return "http://hl7.org/fhir/name-use";
+            case ANONYMOUS: return "http://hl7.org/fhir/name-use";
+            case OLD: return "http://hl7.org/fhir/name-use";
+            case MAIDEN: return "http://hl7.org/fhir/name-use";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IPrimitiveType.java

@@ -0,0 +1,36 @@
+package org.hl7.fhir.instance.model;
+
+import org.hl7.fhir.instance.model.api.IBaseDatatype;
+
+/*
+ * #%L
+ * HAPI FHIR - Core Library
+ * %%
+ * Copyright (C) 2014 - 2015 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%
+ */
+
+
+public interface IPrimitiveType<T> extends IBaseDatatype {
+
+	void setValueAsString(String theValue) throws IllegalArgumentException;
+
+	String getValueAsString();
+
+	T getValue();
+	
+	IPrimitiveType<T> setValue(T theValue) throws IllegalArgumentException;
+	
+}

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java

@@ -44,9 +44,6 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.parser.DataFormatException;
-
 /**
  * This class represents the logical identity for a resource, or as much of that
  * identity is known. In FHIR, every resource must have a "logical ID" which 
@@ -481,7 +478,7 @@ public final class IdType extends UriType implements IPrimitiveType<String>, IId
 	 * </p>
 	 */
 	@Override
-	public IdType setValue(String theValue) throws DataFormatException {
+	public IdType setValue(String theValue) {
 		// TODO: add validation
 		super.setValue(theValue);
 		myHaveComponentParts = false;
@@ -662,8 +659,8 @@ public final class IdType extends UriType implements IPrimitiveType<String>, IId
 	 * Construct a new ID with with form "urn:uuid:[UUID]" where [UUID] is a new, randomly
 	 * created UUID generated by {@link UUID#randomUUID()}
 	 */
-	public static IdDt newRandomUuid() {
-		return new IdDt("urn:uuid:" + UUID.randomUUID().toString());
+	public static IdType newRandomUuid() {
+		return new IdType("urn:uuid:" + UUID.randomUUID().toString());
 	}
 
 }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -90,10 +90,10 @@ public class Identifier extends Type implements ICompositeType {
         }
         public String getSystem() {
           switch (this) {
-            case USUAL: return "http://hl7.org.fhir/identifier-use";
-            case OFFICIAL: return "http://hl7.org.fhir/identifier-use";
-            case TEMP: return "http://hl7.org.fhir/identifier-use";
-            case SECONDARY: return "http://hl7.org.fhir/identifier-use";
+            case USUAL: return "http://hl7.org/fhir/identifier-use";
+            case OFFICIAL: return "http://hl7.org/fhir/identifier-use";
+            case TEMP: return "http://hl7.org/fhir/identifier-use";
+            case SECONDARY: return "http://hl7.org/fhir/identifier-use";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -46,554 +46,6 @@ import org.hl7.fhir.instance.model.api.*;
 @ResourceDef(name="ImagingStudy", profile="http://hl7.org/fhir/Profile/ImagingStudy")
 public class ImagingStudy extends DomainResource {
 
-    public enum ImagingModality {
-        /**
-         * null
-         */
-        AR, 
-        /**
-         * null
-         */
-        BMD, 
-        /**
-         * null
-         */
-        BDUS, 
-        /**
-         * null
-         */
-        EPS, 
-        /**
-         * null
-         */
-        CR, 
-        /**
-         * null
-         */
-        CT, 
-        /**
-         * null
-         */
-        DX, 
-        /**
-         * null
-         */
-        ECG, 
-        /**
-         * null
-         */
-        ES, 
-        /**
-         * null
-         */
-        XC, 
-        /**
-         * null
-         */
-        GM, 
-        /**
-         * null
-         */
-        HD, 
-        /**
-         * null
-         */
-        IO, 
-        /**
-         * null
-         */
-        IVOCT, 
-        /**
-         * null
-         */
-        IVUS, 
-        /**
-         * null
-         */
-        KER, 
-        /**
-         * null
-         */
-        LEN, 
-        /**
-         * null
-         */
-        MR, 
-        /**
-         * null
-         */
-        MG, 
-        /**
-         * null
-         */
-        NM, 
-        /**
-         * null
-         */
-        OAM, 
-        /**
-         * null
-         */
-        OCT, 
-        /**
-         * null
-         */
-        OPM, 
-        /**
-         * null
-         */
-        OP, 
-        /**
-         * null
-         */
-        OPR, 
-        /**
-         * null
-         */
-        OPT, 
-        /**
-         * null
-         */
-        OPV, 
-        /**
-         * null
-         */
-        PX, 
-        /**
-         * null
-         */
-        PT, 
-        /**
-         * null
-         */
-        RF, 
-        /**
-         * null
-         */
-        RG, 
-        /**
-         * null
-         */
-        SM, 
-        /**
-         * null
-         */
-        SRF, 
-        /**
-         * null
-         */
-        US, 
-        /**
-         * null
-         */
-        VA, 
-        /**
-         * null
-         */
-        XA, 
-        /**
-         * added to help the parsers
-         */
-        NULL;
-        public static ImagingModality fromCode(String codeString) throws Exception {
-            if (codeString == null || "".equals(codeString))
-                return null;
-        if ("AR".equals(codeString))
-          return AR;
-        if ("BMD".equals(codeString))
-          return BMD;
-        if ("BDUS".equals(codeString))
-          return BDUS;
-        if ("EPS".equals(codeString))
-          return EPS;
-        if ("CR".equals(codeString))
-          return CR;
-        if ("CT".equals(codeString))
-          return CT;
-        if ("DX".equals(codeString))
-          return DX;
-        if ("ECG".equals(codeString))
-          return ECG;
-        if ("ES".equals(codeString))
-          return ES;
-        if ("XC".equals(codeString))
-          return XC;
-        if ("GM".equals(codeString))
-          return GM;
-        if ("HD".equals(codeString))
-          return HD;
-        if ("IO".equals(codeString))
-          return IO;
-        if ("IVOCT".equals(codeString))
-          return IVOCT;
-        if ("IVUS".equals(codeString))
-          return IVUS;
-        if ("KER".equals(codeString))
-          return KER;
-        if ("LEN".equals(codeString))
-          return LEN;
-        if ("MR".equals(codeString))
-          return MR;
-        if ("MG".equals(codeString))
-          return MG;
-        if ("NM".equals(codeString))
-          return NM;
-        if ("OAM".equals(codeString))
-          return OAM;
-        if ("OCT".equals(codeString))
-          return OCT;
-        if ("OPM".equals(codeString))
-          return OPM;
-        if ("OP".equals(codeString))
-          return OP;
-        if ("OPR".equals(codeString))
-          return OPR;
-        if ("OPT".equals(codeString))
-          return OPT;
-        if ("OPV".equals(codeString))
-          return OPV;
-        if ("PX".equals(codeString))
-          return PX;
-        if ("PT".equals(codeString))
-          return PT;
-        if ("RF".equals(codeString))
-          return RF;
-        if ("RG".equals(codeString))
-          return RG;
-        if ("SM".equals(codeString))
-          return SM;
-        if ("SRF".equals(codeString))
-          return SRF;
-        if ("US".equals(codeString))
-          return US;
-        if ("VA".equals(codeString))
-          return VA;
-        if ("XA".equals(codeString))
-          return XA;
-        throw new Exception("Unknown ImagingModality code '"+codeString+"'");
-        }
-        public String toCode() {
-          switch (this) {
-            case AR: return "AR";
-            case BMD: return "BMD";
-            case BDUS: return "BDUS";
-            case EPS: return "EPS";
-            case CR: return "CR";
-            case CT: return "CT";
-            case DX: return "DX";
-            case ECG: return "ECG";
-            case ES: return "ES";
-            case XC: return "XC";
-            case GM: return "GM";
-            case HD: return "HD";
-            case IO: return "IO";
-            case IVOCT: return "IVOCT";
-            case IVUS: return "IVUS";
-            case KER: return "KER";
-            case LEN: return "LEN";
-            case MR: return "MR";
-            case MG: return "MG";
-            case NM: return "NM";
-            case OAM: return "OAM";
-            case OCT: return "OCT";
-            case OPM: return "OPM";
-            case OP: return "OP";
-            case OPR: return "OPR";
-            case OPT: return "OPT";
-            case OPV: return "OPV";
-            case PX: return "PX";
-            case PT: return "PT";
-            case RF: return "RF";
-            case RG: return "RG";
-            case SM: return "SM";
-            case SRF: return "SRF";
-            case US: return "US";
-            case VA: return "VA";
-            case XA: return "XA";
-            default: return "?";
-          }
-        }
-        public String getSystem() {
-          switch (this) {
-            case AR: return "http://nema.org/dicom/dicm";
-            case BMD: return "http://nema.org/dicom/dicm";
-            case BDUS: return "http://nema.org/dicom/dicm";
-            case EPS: return "http://nema.org/dicom/dicm";
-            case CR: return "http://nema.org/dicom/dicm";
-            case CT: return "http://nema.org/dicom/dicm";
-            case DX: return "http://nema.org/dicom/dicm";
-            case ECG: return "http://nema.org/dicom/dicm";
-            case ES: return "http://nema.org/dicom/dicm";
-            case XC: return "http://nema.org/dicom/dicm";
-            case GM: return "http://nema.org/dicom/dicm";
-            case HD: return "http://nema.org/dicom/dicm";
-            case IO: return "http://nema.org/dicom/dicm";
-            case IVOCT: return "http://nema.org/dicom/dicm";
-            case IVUS: return "http://nema.org/dicom/dicm";
-            case KER: return "http://nema.org/dicom/dicm";
-            case LEN: return "http://nema.org/dicom/dicm";
-            case MR: return "http://nema.org/dicom/dicm";
-            case MG: return "http://nema.org/dicom/dicm";
-            case NM: return "http://nema.org/dicom/dicm";
-            case OAM: return "http://nema.org/dicom/dicm";
-            case OCT: return "http://nema.org/dicom/dicm";
-            case OPM: return "http://nema.org/dicom/dicm";
-            case OP: return "http://nema.org/dicom/dicm";
-            case OPR: return "http://nema.org/dicom/dicm";
-            case OPT: return "http://nema.org/dicom/dicm";
-            case OPV: return "http://nema.org/dicom/dicm";
-            case PX: return "http://nema.org/dicom/dicm";
-            case PT: return "http://nema.org/dicom/dicm";
-            case RF: return "http://nema.org/dicom/dicm";
-            case RG: return "http://nema.org/dicom/dicm";
-            case SM: return "http://nema.org/dicom/dicm";
-            case SRF: return "http://nema.org/dicom/dicm";
-            case US: return "http://nema.org/dicom/dicm";
-            case VA: return "http://nema.org/dicom/dicm";
-            case XA: return "http://nema.org/dicom/dicm";
-            default: return "?";
-          }
-        }
-        public String getDefinition() {
-          switch (this) {
-            case AR: return "";
-            case BMD: return "";
-            case BDUS: return "";
-            case EPS: return "";
-            case CR: return "";
-            case CT: return "";
-            case DX: return "";
-            case ECG: return "";
-            case ES: return "";
-            case XC: return "";
-            case GM: return "";
-            case HD: return "";
-            case IO: return "";
-            case IVOCT: return "";
-            case IVUS: return "";
-            case KER: return "";
-            case LEN: return "";
-            case MR: return "";
-            case MG: return "";
-            case NM: return "";
-            case OAM: return "";
-            case OCT: return "";
-            case OPM: return "";
-            case OP: return "";
-            case OPR: return "";
-            case OPT: return "";
-            case OPV: return "";
-            case PX: return "";
-            case PT: return "";
-            case RF: return "";
-            case RG: return "";
-            case SM: return "";
-            case SRF: return "";
-            case US: return "";
-            case VA: return "";
-            case XA: return "";
-            default: return "?";
-          }
-        }
-        public String getDisplay() {
-          switch (this) {
-            case AR: return "AR";
-            case BMD: return "BMD";
-            case BDUS: return "BDUS";
-            case EPS: return "EPS";
-            case CR: return "CR";
-            case CT: return "CT";
-            case DX: return "DX";
-            case ECG: return "ECG";
-            case ES: return "ES";
-            case XC: return "XC";
-            case GM: return "GM";
-            case HD: return "HD";
-            case IO: return "IO";
-            case IVOCT: return "IVOCT";
-            case IVUS: return "IVUS";
-            case KER: return "KER";
-            case LEN: return "LEN";
-            case MR: return "MR";
-            case MG: return "MG";
-            case NM: return "NM";
-            case OAM: return "OAM";
-            case OCT: return "OCT";
-            case OPM: return "OPM";
-            case OP: return "OP";
-            case OPR: return "OPR";
-            case OPT: return "OPT";
-            case OPV: return "OPV";
-            case PX: return "PX";
-            case PT: return "PT";
-            case RF: return "RF";
-            case RG: return "RG";
-            case SM: return "SM";
-            case SRF: return "SRF";
-            case US: return "US";
-            case VA: return "VA";
-            case XA: return "XA";
-            default: return "?";
-          }
-        }
-    }
-
-  public static class ImagingModalityEnumFactory implements EnumFactory<ImagingModality> {
-    public ImagingModality fromCode(String codeString) throws IllegalArgumentException {
-      if (codeString == null || "".equals(codeString))
-            if (codeString == null || "".equals(codeString))
-                return null;
-        if ("AR".equals(codeString))
-          return ImagingModality.AR;
-        if ("BMD".equals(codeString))
-          return ImagingModality.BMD;
-        if ("BDUS".equals(codeString))
-          return ImagingModality.BDUS;
-        if ("EPS".equals(codeString))
-          return ImagingModality.EPS;
-        if ("CR".equals(codeString))
-          return ImagingModality.CR;
-        if ("CT".equals(codeString))
-          return ImagingModality.CT;
-        if ("DX".equals(codeString))
-          return ImagingModality.DX;
-        if ("ECG".equals(codeString))
-          return ImagingModality.ECG;
-        if ("ES".equals(codeString))
-          return ImagingModality.ES;
-        if ("XC".equals(codeString))
-          return ImagingModality.XC;
-        if ("GM".equals(codeString))
-          return ImagingModality.GM;
-        if ("HD".equals(codeString))
-          return ImagingModality.HD;
-        if ("IO".equals(codeString))
-          return ImagingModality.IO;
-        if ("IVOCT".equals(codeString))
-          return ImagingModality.IVOCT;
-        if ("IVUS".equals(codeString))
-          return ImagingModality.IVUS;
-        if ("KER".equals(codeString))
-          return ImagingModality.KER;
-        if ("LEN".equals(codeString))
-          return ImagingModality.LEN;
-        if ("MR".equals(codeString))
-          return ImagingModality.MR;
-        if ("MG".equals(codeString))
-          return ImagingModality.MG;
-        if ("NM".equals(codeString))
-          return ImagingModality.NM;
-        if ("OAM".equals(codeString))
-          return ImagingModality.OAM;
-        if ("OCT".equals(codeString))
-          return ImagingModality.OCT;
-        if ("OPM".equals(codeString))
-          return ImagingModality.OPM;
-        if ("OP".equals(codeString))
-          return ImagingModality.OP;
-        if ("OPR".equals(codeString))
-          return ImagingModality.OPR;
-        if ("OPT".equals(codeString))
-          return ImagingModality.OPT;
-        if ("OPV".equals(codeString))
-          return ImagingModality.OPV;
-        if ("PX".equals(codeString))
-          return ImagingModality.PX;
-        if ("PT".equals(codeString))
-          return ImagingModality.PT;
-        if ("RF".equals(codeString))
-          return ImagingModality.RF;
-        if ("RG".equals(codeString))
-          return ImagingModality.RG;
-        if ("SM".equals(codeString))
-          return ImagingModality.SM;
-        if ("SRF".equals(codeString))
-          return ImagingModality.SRF;
-        if ("US".equals(codeString))
-          return ImagingModality.US;
-        if ("VA".equals(codeString))
-          return ImagingModality.VA;
-        if ("XA".equals(codeString))
-          return ImagingModality.XA;
-        throw new IllegalArgumentException("Unknown ImagingModality code '"+codeString+"'");
-        }
-    public String toCode(ImagingModality code) {
-      if (code == ImagingModality.AR)
-        return "AR";
-      if (code == ImagingModality.BMD)
-        return "BMD";
-      if (code == ImagingModality.BDUS)
-        return "BDUS";
-      if (code == ImagingModality.EPS)
-        return "EPS";
-      if (code == ImagingModality.CR)
-        return "CR";
-      if (code == ImagingModality.CT)
-        return "CT";
-      if (code == ImagingModality.DX)
-        return "DX";
-      if (code == ImagingModality.ECG)
-        return "ECG";
-      if (code == ImagingModality.ES)
-        return "ES";
-      if (code == ImagingModality.XC)
-        return "XC";
-      if (code == ImagingModality.GM)
-        return "GM";
-      if (code == ImagingModality.HD)
-        return "HD";
-      if (code == ImagingModality.IO)
-        return "IO";
-      if (code == ImagingModality.IVOCT)
-        return "IVOCT";
-      if (code == ImagingModality.IVUS)
-        return "IVUS";
-      if (code == ImagingModality.KER)
-        return "KER";
-      if (code == ImagingModality.LEN)
-        return "LEN";
-      if (code == ImagingModality.MR)
-        return "MR";
-      if (code == ImagingModality.MG)
-        return "MG";
-      if (code == ImagingModality.NM)
-        return "NM";
-      if (code == ImagingModality.OAM)
-        return "OAM";
-      if (code == ImagingModality.OCT)
-        return "OCT";
-      if (code == ImagingModality.OPM)
-        return "OPM";
-      if (code == ImagingModality.OP)
-        return "OP";
-      if (code == ImagingModality.OPR)
-        return "OPR";
-      if (code == ImagingModality.OPT)
-        return "OPT";
-      if (code == ImagingModality.OPV)
-        return "OPV";
-      if (code == ImagingModality.PX)
-        return "PX";
-      if (code == ImagingModality.PT)
-        return "PT";
-      if (code == ImagingModality.RF)
-        return "RF";
-      if (code == ImagingModality.RG)
-        return "RG";
-      if (code == ImagingModality.SM)
-        return "SM";
-      if (code == ImagingModality.SRF)
-        return "SRF";
-      if (code == ImagingModality.US)
-        return "US";
-      if (code == ImagingModality.VA)
-        return "VA";
-      if (code == ImagingModality.XA)
-        return "XA";
-      return "?";
-      }
-    }
-
     public enum InstanceAvailability {
         /**
          * null
@@ -1525,10 +977,10 @@ public class ImagingStudy extends DomainResource {
         protected Enumeration<InstanceAvailability> availability;
 
         /**
-         * WADO-RS resource where the Series is available.
+         * URI/URL specifying the location of the referenced series using WADO-RS.
          */
         @Child(name = "url", type = {UriType.class}, order=7, min=0, max=1)
-        @Description(shortDefinition="Retrieve URI (0008,1115 > 0008,1190)", formalDefinition="WADO-RS resource where the Series is available." )
+        @Description(shortDefinition="Location of the referenced instance(s) (0008,1115 in 0008,1190)", formalDefinition="URI/URL specifying the location of the referenced series using WADO-RS." )
         protected UriType url;
 
         /**
@@ -1857,7 +1309,7 @@ public class ImagingStudy extends DomainResource {
         }
 
         /**
-         * @return {@link #url} (WADO-RS resource where the Series is available.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+         * @return {@link #url} (URI/URL specifying the location of the referenced series using WADO-RS.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
          */
         public UriType getUrlElement() { 
           if (this.url == null)
@@ -1877,7 +1329,7 @@ public class ImagingStudy extends DomainResource {
         }
 
         /**
-         * @param value {@link #url} (WADO-RS resource where the Series is available.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+         * @param value {@link #url} (URI/URL specifying the location of the referenced series using WADO-RS.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
          */
         public ImagingStudySeriesComponent setUrlElement(UriType value) { 
           this.url = value;
@@ -1885,14 +1337,14 @@ public class ImagingStudy extends DomainResource {
         }
 
         /**
-         * @return WADO-RS resource where the Series is available.
+         * @return URI/URL specifying the location of the referenced series using WADO-RS.
          */
         public String getUrl() { 
           return this.url == null ? null : this.url.getValue();
         }
 
         /**
-         * @param value WADO-RS resource where the Series is available.
+         * @param value URI/URL specifying the location of the referenced series using WADO-RS.
          */
         public ImagingStudySeriesComponent setUrl(String value) { 
           if (Utilities.noString(value))
@@ -2050,7 +1502,7 @@ public class ImagingStudy extends DomainResource {
           childrenList.add(new Property("description", "string", "A description of the series.", 0, java.lang.Integer.MAX_VALUE, description));
           childrenList.add(new Property("numberOfInstances", "unsignedInt", "Number of SOP Instances in Series.", 0, java.lang.Integer.MAX_VALUE, numberOfInstances));
           childrenList.add(new Property("availability", "code", "Availability of series (online, offline or nearline).", 0, java.lang.Integer.MAX_VALUE, availability));
-          childrenList.add(new Property("url", "uri", "WADO-RS resource where the Series is available.", 0, java.lang.Integer.MAX_VALUE, url));
+          childrenList.add(new Property("url", "uri", "URI/URL specifying the location of the referenced series using WADO-RS.", 0, java.lang.Integer.MAX_VALUE, url));
           childrenList.add(new Property("bodySite", "Coding", "Body part examined. See  DICOM Part 16 Annex L for the mapping from DICOM to Snomed.", 0, java.lang.Integer.MAX_VALUE, bodySite));
           childrenList.add(new Property("laterality", "Coding", "Laterality if bodySite is paired anatomic structure and laterality is not pre-coordinated in bodySite code, map from (0020, 0060).", 0, java.lang.Integer.MAX_VALUE, laterality));
           childrenList.add(new Property("dateTime", "dateTime", "The date and time when the series was started.", 0, java.lang.Integer.MAX_VALUE, dateTime));
@@ -2518,7 +1970,7 @@ public class ImagingStudy extends DomainResource {
      * The patient imaged in the study.
      */
     @Child(name = "patient", type = {Patient.class}, order=1, min=1, max=1)
-    @Description(shortDefinition="Who the images are of", formalDefinition="The patient imaged in the study." )
+    @Description(shortDefinition="Who the images are of (0010/*)", formalDefinition="The patient imaged in the study." )
     protected Reference patient;
 
     /**
@@ -2534,10 +1986,11 @@ public class ImagingStudy extends DomainResource {
     protected OidType uid;
 
     /**
-     * Accession Number.
+     * Accession Number is an identifier related to some aspect of imaging workflow and data management, and usage may vary across different institutions. 
+See for instance [IHE Radiology Technical Framework Volume 1 Appendix A](http://www.ihe.net/uploadedFiles/Documents/Radiology/IHE_RAD_TF_Rev13.0_Vol1_FT_2014-07-30.pdf).
      */
     @Child(name = "accession", type = {Identifier.class}, order=3, min=0, max=1)
-    @Description(shortDefinition="Accession Number (0008,0050)", formalDefinition="Accession Number." )
+    @Description(shortDefinition="Related workflow identifier ('Accession Number') (0008,0050)", formalDefinition="Accession Number is an identifier related to some aspect of imaging workflow and data management, and usage may vary across different institutions. \nSee for instance [IHE Radiology Technical Framework Volume 1 Appendix A](http://www.ihe.net/uploadedFiles/Documents/Radiology/IHE_RAD_TF_Rev13.0_Vol1_FT_2014-07-30.pdf)." )
     protected Identifier accession;
 
     /**
@@ -2562,9 +2015,9 @@ public class ImagingStudy extends DomainResource {
     /**
      * 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).
      */
-    @Child(name = "modalityList", type = {CodeType.class}, order=6, min=0, max=Child.MAX_UNLIMITED)
+    @Child(name = "modalityList", type = {Coding.class}, order=6, min=0, max=Child.MAX_UNLIMITED)
     @Description(shortDefinition="All series.modality if actual acquisition modalities", formalDefinition="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)." )
-    protected List<Enumeration<ImagingModality>> modalityList;
+    protected List<Coding> modalityList;
 
     /**
      * The requesting/referring physician.
@@ -2616,9 +2069,14 @@ public class ImagingStudy extends DomainResource {
     /**
      * Type of procedure performed.
      */
-    @Child(name = "procedure", type = {Coding.class}, order=13, min=0, max=Child.MAX_UNLIMITED)
+    @Child(name = "procedure", type = {Procedure.class}, order=13, min=0, max=Child.MAX_UNLIMITED)
     @Description(shortDefinition="Type of procedure performed (0008,1032)", formalDefinition="Type of procedure performed." )
-    protected List<Coding> procedure;
+    protected List<Reference> procedure;
+    /**
+     * The actual objects that are the target of the reference (Type of procedure performed.)
+     */
+    protected List<Procedure> procedureTarget;
+
 
     /**
      * Who read study and interpreted the images.
@@ -2646,7 +2104,7 @@ public class ImagingStudy extends DomainResource {
     @Description(shortDefinition="Each study has one or more series of instances", formalDefinition="Each study has one or more series of image instances." )
     protected List<ImagingStudySeriesComponent> series;
 
-    private static final long serialVersionUID = 206272292L;
+    private static final long serialVersionUID = -367817262L;
 
   /*
    * Constructor
@@ -2805,7 +2263,8 @@ public class ImagingStudy extends DomainResource {
     }
 
     /**
-     * @return {@link #accession} (Accession Number.)
+     * @return {@link #accession} (Accession Number is an identifier related to some aspect of imaging workflow and data management, and usage may vary across different institutions. 
+See for instance [IHE Radiology Technical Framework Volume 1 Appendix A](http://www.ihe.net/uploadedFiles/Documents/Radiology/IHE_RAD_TF_Rev13.0_Vol1_FT_2014-07-30.pdf).)
      */
     public Identifier getAccession() { 
       if (this.accession == null)
@@ -2821,7 +2280,8 @@ public class ImagingStudy extends DomainResource {
     }
 
     /**
-     * @param value {@link #accession} (Accession Number.)
+     * @param value {@link #accession} (Accession Number is an identifier related to some aspect of imaging workflow and data management, and usage may vary across different institutions. 
+See for instance [IHE Radiology Technical Framework Volume 1 Appendix A](http://www.ihe.net/uploadedFiles/Documents/Radiology/IHE_RAD_TF_Rev13.0_Vol1_FT_2014-07-30.pdf).)
      */
     public ImagingStudy setAccession(Identifier value) { 
       this.accession = value;
@@ -2932,16 +2392,16 @@ public class ImagingStudy extends DomainResource {
     /**
      * @return {@link #modalityList} (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).)
      */
-    public List<Enumeration<ImagingModality>> getModalityList() { 
+    public List<Coding> getModalityList() { 
       if (this.modalityList == null)
-        this.modalityList = new ArrayList<Enumeration<ImagingModality>>();
+        this.modalityList = new ArrayList<Coding>();
       return this.modalityList;
     }
 
     public boolean hasModalityList() { 
       if (this.modalityList == null)
         return false;
-      for (Enumeration<ImagingModality> item : this.modalityList)
+      for (Coding item : this.modalityList)
         if (!item.isEmpty())
           return true;
       return false;
@@ -2951,38 +2411,24 @@ public class ImagingStudy extends DomainResource {
      * @return {@link #modalityList} (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).)
      */
     // syntactic sugar
-    public Enumeration<ImagingModality> addModalityListElement() {//2 
-      Enumeration<ImagingModality> t = new Enumeration<ImagingModality>(new ImagingModalityEnumFactory());
+    public Coding addModalityList() { //3
+      Coding t = new Coding();
       if (this.modalityList == null)
-        this.modalityList = new ArrayList<Enumeration<ImagingModality>>();
+        this.modalityList = new ArrayList<Coding>();
       this.modalityList.add(t);
       return t;
     }
 
-    /**
-     * @param value {@link #modalityList} (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).)
-     */
-    public ImagingStudy addModalityList(ImagingModality value) { //1
-      Enumeration<ImagingModality> t = new Enumeration<ImagingModality>(new ImagingModalityEnumFactory());
-      t.setValue(value);
+    // syntactic sugar
+    public ImagingStudy addModalityList(Coding t) { //3
+      if (t == null)
+        return this;
       if (this.modalityList == null)
-        this.modalityList = new ArrayList<Enumeration<ImagingModality>>();
+        this.modalityList = new ArrayList<Coding>();
       this.modalityList.add(t);
       return this;
     }
 
-    /**
-     * @param value {@link #modalityList} (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).)
-     */
-    public boolean hasModalityList(ImagingModality value) { 
-      if (this.modalityList == null)
-        return false;
-      for (Enumeration<ImagingModality> v : this.modalityList)
-        if (v.equals(value)) // code
-          return true;
-      return false;
-    }
-
     /**
      * @return {@link #referrer} (The requesting/referring physician.)
      */
@@ -3267,16 +2713,16 @@ public class ImagingStudy extends DomainResource {
     /**
      * @return {@link #procedure} (Type of procedure performed.)
      */
-    public List<Coding> getProcedure() { 
+    public List<Reference> getProcedure() { 
       if (this.procedure == null)
-        this.procedure = new ArrayList<Coding>();
+        this.procedure = new ArrayList<Reference>();
       return this.procedure;
     }
 
     public boolean hasProcedure() { 
       if (this.procedure == null)
         return false;
-      for (Coding item : this.procedure)
+      for (Reference item : this.procedure)
         if (!item.isEmpty())
           return true;
       return false;
@@ -3286,24 +2732,45 @@ public class ImagingStudy extends DomainResource {
      * @return {@link #procedure} (Type of procedure performed.)
      */
     // syntactic sugar
-    public Coding addProcedure() { //3
-      Coding t = new Coding();
+    public Reference addProcedure() { //3
+      Reference t = new Reference();
       if (this.procedure == null)
-        this.procedure = new ArrayList<Coding>();
+        this.procedure = new ArrayList<Reference>();
       this.procedure.add(t);
       return t;
     }
 
     // syntactic sugar
-    public ImagingStudy addProcedure(Coding t) { //3
+    public ImagingStudy addProcedure(Reference t) { //3
       if (t == null)
         return this;
       if (this.procedure == null)
-        this.procedure = new ArrayList<Coding>();
+        this.procedure = new ArrayList<Reference>();
       this.procedure.add(t);
       return this;
     }
 
+    /**
+     * @return {@link #procedure} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. Type of procedure performed.)
+     */
+    public List<Procedure> getProcedureTarget() { 
+      if (this.procedureTarget == null)
+        this.procedureTarget = new ArrayList<Procedure>();
+      return this.procedureTarget;
+    }
+
+    // syntactic sugar
+    /**
+     * @return {@link #procedure} (Add an actual object that is the target of the reference. The reference library doesn't use these, but you can use this to hold the resources if you resolvethemt. Type of procedure performed.)
+     */
+    public Procedure addProcedureTarget() { 
+      Procedure r = new Procedure();
+      if (this.procedureTarget == null)
+        this.procedureTarget = new ArrayList<Procedure>();
+      this.procedureTarget.add(r);
+      return r;
+    }
+
     /**
      * @return {@link #interpreter} (Who read study and interpreted the images.)
      */
@@ -3442,17 +2909,17 @@ public class ImagingStudy extends DomainResource {
         childrenList.add(new Property("started", "dateTime", "Date and Time the study started. Timezone Offset From UTC.", 0, java.lang.Integer.MAX_VALUE, started));
         childrenList.add(new Property("patient", "Reference(Patient)", "The patient imaged in the study.", 0, java.lang.Integer.MAX_VALUE, patient));
         childrenList.add(new Property("uid", "oid", "Formal identifier for the study.", 0, java.lang.Integer.MAX_VALUE, uid));
-        childrenList.add(new Property("accession", "Identifier", "Accession Number.", 0, java.lang.Integer.MAX_VALUE, accession));
+        childrenList.add(new Property("accession", "Identifier", "Accession Number is an identifier related to some aspect of imaging workflow and data management, and usage may vary across different institutions. \nSee for instance [IHE Radiology Technical Framework Volume 1 Appendix A](http://www.ihe.net/uploadedFiles/Documents/Radiology/IHE_RAD_TF_Rev13.0_Vol1_FT_2014-07-30.pdf).", 0, java.lang.Integer.MAX_VALUE, accession));
         childrenList.add(new Property("identifier", "Identifier", "Other identifiers for the study.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("order", "Reference(DiagnosticOrder)", "A list of the diagnostic orders that resulted in this imaging study being performed.", 0, java.lang.Integer.MAX_VALUE, order));
-        childrenList.add(new Property("modalityList", "code", "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).", 0, java.lang.Integer.MAX_VALUE, modalityList));
+        childrenList.add(new Property("modalityList", "Coding", "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).", 0, java.lang.Integer.MAX_VALUE, modalityList));
         childrenList.add(new Property("referrer", "Reference(Practitioner)", "The requesting/referring physician.", 0, java.lang.Integer.MAX_VALUE, referrer));
         childrenList.add(new Property("availability", "code", "Availability of study (online, offline or nearline).", 0, java.lang.Integer.MAX_VALUE, availability));
         childrenList.add(new Property("url", "uri", "WADO-RS resource where Study is available.", 0, java.lang.Integer.MAX_VALUE, url));
         childrenList.add(new Property("numberOfSeries", "unsignedInt", "Number of Series in Study.", 0, java.lang.Integer.MAX_VALUE, numberOfSeries));
         childrenList.add(new Property("numberOfInstances", "unsignedInt", "Number of SOP Instances in Study.", 0, java.lang.Integer.MAX_VALUE, numberOfInstances));
         childrenList.add(new Property("clinicalInformation", "string", "Diagnoses etc provided with request.", 0, java.lang.Integer.MAX_VALUE, clinicalInformation));
-        childrenList.add(new Property("procedure", "Coding", "Type of procedure performed.", 0, java.lang.Integer.MAX_VALUE, procedure));
+        childrenList.add(new Property("procedure", "Reference(Procedure)", "Type of procedure performed.", 0, java.lang.Integer.MAX_VALUE, procedure));
         childrenList.add(new Property("interpreter", "Reference(Practitioner)", "Who read study and interpreted the images.", 0, java.lang.Integer.MAX_VALUE, interpreter));
         childrenList.add(new Property("description", "string", "Institution-generated description or classification of the Study performed.", 0, java.lang.Integer.MAX_VALUE, description));
         childrenList.add(new Property("series", "", "Each study has one or more series of image instances.", 0, java.lang.Integer.MAX_VALUE, series));
@@ -3476,8 +2943,8 @@ public class ImagingStudy extends DomainResource {
             dst.order.add(i.copy());
         };
         if (modalityList != null) {
-          dst.modalityList = new ArrayList<Enumeration<ImagingModality>>();
-          for (Enumeration<ImagingModality> i : modalityList)
+          dst.modalityList = new ArrayList<Coding>();
+          for (Coding i : modalityList)
             dst.modalityList.add(i.copy());
         };
         dst.referrer = referrer == null ? null : referrer.copy();
@@ -3487,8 +2954,8 @@ public class ImagingStudy extends DomainResource {
         dst.numberOfInstances = numberOfInstances == null ? null : numberOfInstances.copy();
         dst.clinicalInformation = clinicalInformation == null ? null : clinicalInformation.copy();
         if (procedure != null) {
-          dst.procedure = new ArrayList<Coding>();
-          for (Coding i : procedure)
+          dst.procedure = new ArrayList<Reference>();
+          for (Reference i : procedure)
             dst.procedure.add(i.copy());
         };
         dst.interpreter = interpreter == null ? null : interpreter.copy();
@@ -3528,10 +2995,10 @@ public class ImagingStudy extends DomainResource {
         if (!(other instanceof ImagingStudy))
           return false;
         ImagingStudy o = (ImagingStudy) other;
-        return compareValues(started, o.started, true) && compareValues(uid, o.uid, true) && compareValues(modalityList, o.modalityList, true)
-           && compareValues(availability, o.availability, true) && compareValues(url, o.url, true) && compareValues(numberOfSeries, o.numberOfSeries, true)
-           && compareValues(numberOfInstances, o.numberOfInstances, true) && compareValues(clinicalInformation, o.clinicalInformation, true)
-           && compareValues(description, o.description, true);
+        return compareValues(started, o.started, true) && compareValues(uid, o.uid, true) && compareValues(availability, o.availability, true)
+           && compareValues(url, o.url, true) && compareValues(numberOfSeries, o.numberOfSeries, true) && compareValues(numberOfInstances, o.numberOfInstances, true)
+           && compareValues(clinicalInformation, o.clinicalInformation, true) && compareValues(description, o.description, true)
+          ;
       }
 
       public boolean isEmpty() {

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -902,7 +902,7 @@ public class Immunization extends DomainResource {
      * Indicates if the vaccination was or was not given.
      */
     @Child(name = "wasNotGiven", type = {BooleanType.class}, order=4, min=1, max=1)
-    @Description(shortDefinition="Was immunization given?", formalDefinition="Indicates if the vaccination was or was not given." )
+    @Description(shortDefinition="Flag for whether immunization was given", formalDefinition="Indicates if the vaccination was or was not given." )
     protected BooleanType wasNotGiven;
 
     /**

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -84,9 +84,9 @@ public class List_ extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case CURRENT: return "http://hl7.org.fhir/list-status";
-            case RETIRED: return "http://hl7.org.fhir/list-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/list-status";
+            case CURRENT: return "http://hl7.org/fhir/list-status";
+            case RETIRED: return "http://hl7.org/fhir/list-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/list-status";
             default: return "?";
           }
         }
@@ -142,7 +142,7 @@ public class List_ extends DomainResource {
          */
         SNAPSHOT, 
         /**
-         * The list is prepared as a statement of changes that have been made or recommended
+         * A list that indicates where changes have been made or recommended
          */
         CHANGES, 
         /**
@@ -170,9 +170,9 @@ public class List_ extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case WORKING: return "http://hl7.org.fhir/list-mode";
-            case SNAPSHOT: return "http://hl7.org.fhir/list-mode";
-            case CHANGES: return "http://hl7.org.fhir/list-mode";
+            case WORKING: return "http://hl7.org/fhir/list-mode";
+            case SNAPSHOT: return "http://hl7.org/fhir/list-mode";
+            case CHANGES: return "http://hl7.org/fhir/list-mode";
             default: return "?";
           }
         }
@@ -180,7 +180,7 @@ public class List_ extends DomainResource {
           switch (this) {
             case WORKING: return "This list is the master list, maintained in an ongoing fashion with regular updates as the real world list it is tracking changes";
             case SNAPSHOT: return "This list was prepared as a snapshot. It should not be assumed to be current";
-            case CHANGES: return "The list is prepared as a statement of changes that have been made or recommended";
+            case CHANGES: return "A list that indicates where changes have been made or recommended";
             default: return "?";
           }
         }
@@ -538,56 +538,68 @@ public class List_ extends DomainResource {
      */
     protected Resource sourceTarget;
 
+    /**
+     * The encounter that is the context in which this list was created.
+     */
+    @Child(name = "encounter", type = {Encounter.class}, order=5, min=0, max=1)
+    @Description(shortDefinition="Context in which list created", formalDefinition="The encounter that is the context in which this list was created." )
+    protected Reference encounter;
+
+    /**
+     * The actual object that is the target of the reference (The encounter that is the context in which this list was created.)
+     */
+    protected Encounter encounterTarget;
+
     /**
      * Indicates the current state of this list.
      */
-    @Child(name = "status", type = {CodeType.class}, order=5, min=1, max=1)
+    @Child(name = "status", type = {CodeType.class}, order=6, min=1, max=1)
     @Description(shortDefinition="current | retired | entered-in-error", formalDefinition="Indicates the current state of this list." )
     protected Enumeration<ListStatus> status;
 
     /**
      * The date that the list was prepared.
      */
-    @Child(name = "date", type = {DateTimeType.class}, order=6, min=0, max=1)
+    @Child(name = "date", type = {DateTimeType.class}, order=7, min=0, max=1)
     @Description(shortDefinition="When the list was prepared", formalDefinition="The date that the list was prepared." )
     protected DateTimeType date;
 
     /**
      * What order applies to the items in the list.
      */
-    @Child(name = "orderedBy", type = {CodeableConcept.class}, order=7, min=0, max=1)
+    @Child(name = "orderedBy", type = {CodeableConcept.class}, order=8, min=0, max=1)
     @Description(shortDefinition="What order the list has", formalDefinition="What order applies to the items in the list." )
     protected CodeableConcept orderedBy;
 
     /**
      * How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted.
      */
-    @Child(name = "mode", type = {CodeType.class}, order=8, min=1, max=1)
+    @Child(name = "mode", type = {CodeType.class}, order=9, min=1, max=1)
     @Description(shortDefinition="working | snapshot | changes", formalDefinition="How this list was prepared - whether it is a working list that is suitable for being maintained on an ongoing basis, or if it represents a snapshot of a list of items from another source, or whether it is a prepared list where items may be marked as added, modified or deleted." )
     protected Enumeration<ListMode> mode;
 
     /**
      * Comments that apply to the overall list.
      */
-    @Child(name = "note", type = {StringType.class}, order=9, min=0, max=1)
-    @Description(shortDefinition="Comments about the note", formalDefinition="Comments that apply to the overall list." )
+    @Child(name = "note", type = {StringType.class}, order=10, min=0, max=1)
+    @Description(shortDefinition="Comments about the list", formalDefinition="Comments that apply to the overall list." )
     protected StringType note;
 
     /**
      * Entries in this list.
      */
-    @Child(name = "entry", type = {}, order=10, min=0, max=Child.MAX_UNLIMITED)
+    @Child(name = "entry", type = {}, order=11, min=0, max=Child.MAX_UNLIMITED)
     @Description(shortDefinition="Entries in the list", formalDefinition="Entries in this list." )
     protected List<ListEntryComponent> entry;
 
     /**
      * If the list is empty, why the list is empty.
      */
-    @Child(name = "emptyReason", type = {CodeableConcept.class}, order=11, min=0, max=1)
+    @Child(name = "emptyReason", type = {CodeableConcept.class}, order=12, min=0, max=1)
     @Description(shortDefinition="Why list is empty", formalDefinition="If the list is empty, why the list is empty." )
     protected CodeableConcept emptyReason;
 
-    private static final long serialVersionUID = -558571391L;
+    private static final long serialVersionUID = 1819128642L;
 
   /*
    * Constructor
@@ -796,6 +808,50 @@ public class List_ extends DomainResource {
       return this;
     }
 
+    /**
+     * @return {@link #encounter} (The encounter that is the context in which this list was created.)
+     */
+    public Reference getEncounter() { 
+      if (this.encounter == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create List_.encounter");
+        else if (Configuration.doAutoCreate())
+          this.encounter = new Reference(); // cc
+      return this.encounter;
+    }
+
+    public boolean hasEncounter() { 
+      return this.encounter != null && !this.encounter.isEmpty();
+    }
+
+    /**
+     * @param value {@link #encounter} (The encounter that is the context in which this list was created.)
+     */
+    public List_ setEncounter(Reference value) { 
+      this.encounter = value;
+      return this;
+    }
+
+    /**
+     * @return {@link #encounter} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (The encounter that is the context in which this list was created.)
+     */
+    public Encounter getEncounterTarget() { 
+      if (this.encounterTarget == null)
+        if (Configuration.errorOnAutoCreate())
+          throw new Error("Attempt to auto-create List_.encounter");
+        else if (Configuration.doAutoCreate())
+          this.encounterTarget = new Encounter(); // aa
+      return this.encounterTarget;
+    }
+
+    /**
+     * @param value {@link #encounter} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (The encounter that is the context in which this list was created.)
+     */
+    public List_ setEncounterTarget(Encounter value) { 
+      this.encounterTarget = value;
+      return this;
+    }
+
     /**
      * @return {@link #status} (Indicates the current state of this list.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
      */
@@ -1079,6 +1135,7 @@ public class List_ extends DomainResource {
         childrenList.add(new Property("code", "CodeableConcept", "This code defines the purpose of the list - why it was created.", 0, java.lang.Integer.MAX_VALUE, code));
         childrenList.add(new Property("subject", "Reference(Patient|Group|Device|Location)", "The common subject (or patient) of the resources that are in the list, if there is one.", 0, java.lang.Integer.MAX_VALUE, subject));
         childrenList.add(new Property("source", "Reference(Practitioner|Patient|Device)", "The entity responsible for deciding what the contents of the list were.", 0, java.lang.Integer.MAX_VALUE, source));
+        childrenList.add(new Property("encounter", "Reference(Encounter)", "The encounter that is the context in which this list was created.", 0, java.lang.Integer.MAX_VALUE, encounter));
         childrenList.add(new Property("status", "code", "Indicates the current state of this list.", 0, java.lang.Integer.MAX_VALUE, status));
         childrenList.add(new Property("date", "dateTime", "The date that the list was prepared.", 0, java.lang.Integer.MAX_VALUE, date));
         childrenList.add(new Property("orderedBy", "CodeableConcept", "What order applies to the items in the list.", 0, java.lang.Integer.MAX_VALUE, orderedBy));
@@ -1100,6 +1157,7 @@ public class List_ extends DomainResource {
         dst.code = code == null ? null : code.copy();
         dst.subject = subject == null ? null : subject.copy();
         dst.source = source == null ? null : source.copy();
+        dst.encounter = encounter == null ? null : encounter.copy();
         dst.status = status == null ? null : status.copy();
         dst.date = date == null ? null : date.copy();
         dst.orderedBy = orderedBy == null ? null : orderedBy.copy();
@@ -1126,10 +1184,10 @@ public class List_ extends DomainResource {
           return false;
         List_ o = (List_) other;
         return compareDeep(identifier, o.identifier, true) && compareDeep(title, o.title, true) && compareDeep(code, o.code, true)
-           && compareDeep(subject, o.subject, true) && compareDeep(source, o.source, true) && compareDeep(status, o.status, true)
-           && compareDeep(date, o.date, true) && compareDeep(orderedBy, o.orderedBy, true) && compareDeep(mode, o.mode, true)
-           && compareDeep(note, o.note, true) && compareDeep(entry, o.entry, true) && compareDeep(emptyReason, o.emptyReason, true)
-          ;
+           && compareDeep(subject, o.subject, true) && compareDeep(source, o.source, true) && compareDeep(encounter, o.encounter, true)
+           && compareDeep(status, o.status, true) && compareDeep(date, o.date, true) && compareDeep(orderedBy, o.orderedBy, true)
+           && compareDeep(mode, o.mode, true) && compareDeep(note, o.note, true) && compareDeep(entry, o.entry, true)
+           && compareDeep(emptyReason, o.emptyReason, true);
       }
 
       @Override
@@ -1146,9 +1204,9 @@ public class List_ extends DomainResource {
       public boolean isEmpty() {
         return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (title == null || title.isEmpty())
            && (code == null || code.isEmpty()) && (subject == null || subject.isEmpty()) && (source == null || source.isEmpty())
-           && (status == null || status.isEmpty()) && (date == null || date.isEmpty()) && (orderedBy == null || orderedBy.isEmpty())
-           && (mode == null || mode.isEmpty()) && (note == null || note.isEmpty()) && (entry == null || entry.isEmpty())
-           && (emptyReason == null || emptyReason.isEmpty());
+           && (encounter == null || encounter.isEmpty()) && (status == null || status.isEmpty()) && (date == null || date.isEmpty())
+           && (orderedBy == null || orderedBy.isEmpty()) && (mode == null || mode.isEmpty()) && (note == null || note.isEmpty())
+           && (entry == null || entry.isEmpty()) && (emptyReason == null || emptyReason.isEmpty());
       }
 
   @Override
@@ -1164,7 +1222,7 @@ public class List_ extends DomainResource {
   public static final String SP_EMPTYREASON = "empty-reason";
   @SearchParamDefinition(name="code", path="List.code", description="What the purpose of this list is", type="token" )
   public static final String SP_CODE = "code";
-  @SearchParamDefinition(name="notes", path="List.note", description="Comments about the note", type="string" )
+  @SearchParamDefinition(name="notes", path="List.note", description="Comments about the list", type="string" )
   public static final String SP_NOTES = "notes";
   @SearchParamDefinition(name="subject", path="List.subject", description="If all resources have the same subject", type="reference" )
   public static final String SP_SUBJECT = "subject";
@@ -1172,6 +1230,8 @@ public class List_ extends DomainResource {
   public static final String SP_PATIENT = "patient";
   @SearchParamDefinition(name="source", path="List.source", description="Who and/or what defined the list contents", type="reference" )
   public static final String SP_SOURCE = "source";
+  @SearchParamDefinition(name="encounter", path="List.encounter", description="Context in which list created", type="reference" )
+  public static final String SP_ENCOUNTER = "encounter";
   @SearchParamDefinition(name="title", path="List.title", description="Descriptive name for the list", type="string" )
   public static final String SP_TITLE = "title";
   @SearchParamDefinition(name="status", path="List.status", description="current | retired | entered-in-error", type="token" )

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -78,8 +78,8 @@ public class Location extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case INSTANCE: return "http://hl7.org.fhir/location-mode";
-            case KIND: return "http://hl7.org.fhir/location-mode";
+            case INSTANCE: return "http://hl7.org/fhir/location-mode";
+            case KIND: return "http://hl7.org/fhir/location-mode";
             default: return "?";
           }
         }
@@ -157,9 +157,9 @@ public class Location extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case ACTIVE: return "http://hl7.org.fhir/location-status";
-            case SUSPENDED: return "http://hl7.org.fhir/location-status";
-            case INACTIVE: return "http://hl7.org.fhir/location-status";
+            case ACTIVE: return "http://hl7.org/fhir/location-status";
+            case SUSPENDED: return "http://hl7.org/fhir/location-status";
+            case INACTIVE: return "http://hl7.org/fhir/location-status";
             default: return "?";
           }
         }
@@ -1085,14 +1085,24 @@ public class Location extends DomainResource {
   public static final String SP_NEARDISTANCE = "near-distance";
   @SearchParamDefinition(name="address", path="Location.address", description="A (part of the) address of the location", type="string" )
   public static final String SP_ADDRESS = "address";
+  @SearchParamDefinition(name="address-state", path="Location.address.state", description="A state specified in an address", type="string" )
+  public static final String SP_ADDRESSSTATE = "address-state";
+  @SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location", type="token" )
+  public static final String SP_TYPE = "type";
+  @SearchParamDefinition(name="address-postalcode", path="Location.address.postalCode", description="A postalCode specified in an address", type="string" )
+  public static final String SP_ADDRESSPOSTALCODE = "address-postalcode";
+  @SearchParamDefinition(name="address-country", path="Location.address.country", description="A country specified in an address", type="string" )
+  public static final String SP_ADDRESSCOUNTRY = "address-country";
   @SearchParamDefinition(name="organization", path="Location.managingOrganization", description="Searches for locations that are managed by the provided organization", type="reference" )
   public static final String SP_ORGANIZATION = "organization";
   @SearchParamDefinition(name="name", path="Location.name", description="A (portion of the) name of the location", type="string" )
   public static final String SP_NAME = "name";
+  @SearchParamDefinition(name="address-use", path="Location.address.use", description="A use code specified in an address", type="token" )
+  public static final String SP_ADDRESSUSE = "address-use";
   @SearchParamDefinition(name="near", path="", description="The coordinates expressed as [lat],[long] (using the WGS84 datum, see notes) to find locations near to (servers may search using a square rather than a circle for efficiency)", type="token" )
   public static final String SP_NEAR = "near";
-  @SearchParamDefinition(name="type", path="Location.type", description="A code for the type of location", type="token" )
-  public static final String SP_TYPE = "type";
+  @SearchParamDefinition(name="address-city", path="Location.address.city", description="A city specified in an address", type="string" )
+  public static final String SP_ADDRESSCITY = "address-city";
   @SearchParamDefinition(name="status", path="Location.status", description="Searches for locations with a specific kind of status", type="token" )
   public static final String SP_STATUS = "status";
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -84,9 +84,9 @@ public class Media extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PHOTO: return "http://hl7.org.fhir/digital-media-type";
-            case VIDEO: return "http://hl7.org.fhir/digital-media-type";
-            case AUDIO: return "http://hl7.org.fhir/digital-media-type";
+            case PHOTO: return "http://hl7.org/fhir/digital-media-type";
+            case VIDEO: return "http://hl7.org/fhir/digital-media-type";
+            case AUDIO: return "http://hl7.org/fhir/digital-media-type";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -77,8 +77,8 @@ public class Medication extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PRODUCT: return "http://hl7.org.fhir/medication-kind";
-            case PACKAGE: return "http://hl7.org.fhir/medication-kind";
+            case PRODUCT: return "http://hl7.org/fhir/medication-kind";
+            case PACKAGE: return "http://hl7.org/fhir/medication-kind";
             default: return "?";
           }
         }
@@ -945,7 +945,7 @@ public class Medication extends DomainResource {
     /**
      * Information that only applies to packages (not products).
      */
-    @Child(name = "package", type = {}, order=6, min=0, max=1)
+    @Child(name = "package_", type = {}, order=6, min=0, max=1)
     @Description(shortDefinition="Details about packaged medications", formalDefinition="Information that only applies to packages (not products)." )
     protected MedicationPackageComponent package_;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -98,11 +98,11 @@ public class MedicationAdministration extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case INPROGRESS: return "http://hl7.org.fhir/medication-admin-status";
-            case ONHOLD: return "http://hl7.org.fhir/medication-admin-status";
-            case COMPLETED: return "http://hl7.org.fhir/medication-admin-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/medication-admin-status";
-            case STOPPED: return "http://hl7.org.fhir/medication-admin-status";
+            case INPROGRESS: return "http://hl7.org/fhir/medication-admin-status";
+            case ONHOLD: return "http://hl7.org/fhir/medication-admin-status";
+            case COMPLETED: return "http://hl7.org/fhir/medication-admin-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/medication-admin-status";
+            case STOPPED: return "http://hl7.org/fhir/medication-admin-status";
             default: return "?";
           }
         }
@@ -198,10 +198,10 @@ public class MedicationAdministration extends DomainResource {
         protected Quantity quantity;
 
         /**
-         * Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.
+         * Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.
          */
         @Child(name = "rate", type = {Ratio.class}, order=6, min=0, max=1)
-        @Description(shortDefinition="Dose quantity per unit of time", formalDefinition="Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity." )
+        @Description(shortDefinition="Dose quantity per unit of time", formalDefinition="Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity." )
         protected Ratio rate;
 
         private static final long serialVersionUID = -358534919L;
@@ -359,7 +359,7 @@ public class MedicationAdministration extends DomainResource {
         }
 
         /**
-         * @return {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.)
+         * @return {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.)
          */
         public Ratio getRate() { 
           if (this.rate == null)
@@ -375,7 +375,7 @@ public class MedicationAdministration extends DomainResource {
         }
 
         /**
-         * @param value {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.)
+         * @param value {@link #rate} (Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.)
          */
         public MedicationAdministrationDosageComponent setRate(Ratio value) { 
           this.rate = value;
@@ -389,7 +389,7 @@ public class MedicationAdministration extends DomainResource {
           childrenList.add(new Property("route", "CodeableConcept", "A code specifying the route or physiological path of administration of a therapeutic agent into or onto the patient.   E.g. topical, intravenous, etc.", 0, java.lang.Integer.MAX_VALUE, route));
           childrenList.add(new Property("method", "CodeableConcept", "A coded value indicating the method by which the medication was introduced into or onto the body. Most commonly used for injections.  Examples:  Slow Push; Deep IV.\r\rTerminologies used often pre-coordinate this term with the route and or form of administration.", 0, java.lang.Integer.MAX_VALUE, method));
           childrenList.add(new Property("quantity", "Quantity", "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.", 0, java.lang.Integer.MAX_VALUE, quantity));
-          childrenList.add(new Property("rate", "Ratio", "Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.", 0, java.lang.Integer.MAX_VALUE, rate));
+          childrenList.add(new Property("rate", "Ratio", "Identifies the speed with which the medication was introduced into the patient. Typically the rate for an infusion e.g. 200ml in 2 hours.  May also be expressed as a rate per unit of time such as 100ml per hour - the duration is then not specified, or is specified in the quantity.", 0, java.lang.Integer.MAX_VALUE, rate));
         }
 
       public MedicationAdministrationDosageComponent copy() {
@@ -979,6 +979,10 @@ public class MedicationAdministration extends DomainResource {
       return (DateTimeType) this.effectiveTime;
     }
 
+    public boolean hasEffectiveTimeDateTimeType() throws Exception { 
+      return this.effectiveTime instanceof DateTimeType;
+    }
+
     /**
      * @return {@link #effectiveTime} (An interval of time during which the administration took place (or did not take place, when the 'notGiven' attribute is true).  For many administrations, such as swallowing a tablet the use of dateTime is more appropriate.)
      */
@@ -988,6 +992,10 @@ public class MedicationAdministration extends DomainResource {
       return (Period) this.effectiveTime;
     }
 
+    public boolean hasEffectiveTimePeriod() throws Exception { 
+      return this.effectiveTime instanceof Period;
+    }
+
     public boolean hasEffectiveTime() { 
       return this.effectiveTime != null && !this.effectiveTime.isEmpty();
     }
@@ -1016,6 +1024,10 @@ public class MedicationAdministration extends DomainResource {
       return (CodeableConcept) this.medication;
     }
 
+    public boolean hasMedicationCodeableConcept() throws Exception { 
+      return this.medication instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #medication} (Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
      */
@@ -1025,6 +1037,10 @@ public class MedicationAdministration extends DomainResource {
       return (Reference) this.medication;
     }
 
+    public boolean hasMedicationReference() throws Exception { 
+      return this.medication instanceof Reference;
+    }
+
     public boolean hasMedication() { 
       return this.medication != null && !this.medication.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -98,11 +98,11 @@ public class MedicationDispense extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case INPROGRESS: return "http://hl7.org.fhir/medication-dispense-status";
-            case ONHOLD: return "http://hl7.org.fhir/medication-dispense-status";
-            case COMPLETED: return "http://hl7.org.fhir/medication-dispense-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/medication-dispense-status";
-            case STOPPED: return "http://hl7.org.fhir/medication-dispense-status";
+            case INPROGRESS: return "http://hl7.org/fhir/medication-dispense-status";
+            case ONHOLD: return "http://hl7.org/fhir/medication-dispense-status";
+            case COMPLETED: return "http://hl7.org/fhir/medication-dispense-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/medication-dispense-status";
+            case STOPPED: return "http://hl7.org/fhir/medication-dispense-status";
             default: return "?";
           }
         }
@@ -330,6 +330,10 @@ public class MedicationDispense extends DomainResource {
           return (DateTimeType) this.schedule;
         }
 
+        public boolean hasScheduleDateTimeType() throws Exception { 
+          return this.schedule instanceof DateTimeType;
+        }
+
         /**
          * @return {@link #schedule} (The timing schedule for giving the medication to the patient.  The Schedule data type allows many different expressions, for example.  "Every  8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:";  "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".)
          */
@@ -339,6 +343,10 @@ public class MedicationDispense extends DomainResource {
           return (Period) this.schedule;
         }
 
+        public boolean hasSchedulePeriod() throws Exception { 
+          return this.schedule instanceof Period;
+        }
+
         /**
          * @return {@link #schedule} (The timing schedule for giving the medication to the patient.  The Schedule data type allows many different expressions, for example.  "Every  8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:";  "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".)
          */
@@ -348,6 +356,10 @@ public class MedicationDispense extends DomainResource {
           return (Timing) this.schedule;
         }
 
+        public boolean hasScheduleTiming() throws Exception { 
+          return this.schedule instanceof Timing;
+        }
+
         public boolean hasSchedule() { 
           return this.schedule != null && !this.schedule.isEmpty();
         }
@@ -376,6 +388,10 @@ public class MedicationDispense extends DomainResource {
           return (BooleanType) this.asNeeded;
         }
 
+        public boolean hasAsNeededBooleanType() throws Exception { 
+          return this.asNeeded instanceof BooleanType;
+        }
+
         /**
          * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose.  If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.)
          */
@@ -385,6 +401,10 @@ public class MedicationDispense extends DomainResource {
           return (CodeableConcept) this.asNeeded;
         }
 
+        public boolean hasAsNeededCodeableConcept() throws Exception { 
+          return this.asNeeded instanceof CodeableConcept;
+        }
+
         public boolean hasAsNeeded() { 
           return this.asNeeded != null && !this.asNeeded.isEmpty();
         }
@@ -485,6 +505,10 @@ public class MedicationDispense extends DomainResource {
           return (Range) this.dose;
         }
 
+        public boolean hasDoseRange() throws Exception { 
+          return this.dose instanceof Range;
+        }
+
         /**
          * @return {@link #dose} (The amount of therapeutic or other substance given at one administration event.)
          */
@@ -494,6 +518,10 @@ public class MedicationDispense extends DomainResource {
           return (Quantity) this.dose;
         }
 
+        public boolean hasDoseQuantity() throws Exception { 
+          return this.dose instanceof Quantity;
+        }
+
         public boolean hasDose() { 
           return this.dose != null && !this.dose.isEmpty();
         }
@@ -1303,6 +1331,10 @@ public class MedicationDispense extends DomainResource {
       return (CodeableConcept) this.medication;
     }
 
+    public boolean hasMedicationCodeableConcept() throws Exception { 
+      return this.medication instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
      */
@@ -1312,6 +1344,10 @@ public class MedicationDispense extends DomainResource {
       return (Reference) this.medication;
     }
 
+    public boolean hasMedicationReference() throws Exception { 
+      return this.medication instanceof Reference;
+    }
+
     public boolean hasMedication() { 
       return this.medication != null && !this.medication.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -70,7 +70,7 @@ public class MedicationPrescription extends DomainResource {
         /**
          * The prescription was replaced by a newer one, which encompasses all the information in the previous one.
          */
-        SUPERCEDED, 
+        SUPERSEDED, 
         /**
          * The prescription is not yet 'actionable', i.e. it is a work in progress, required sign-off, need to be run through decision support.
          */
@@ -92,8 +92,8 @@ public class MedicationPrescription extends DomainResource {
           return ENTEREDINERROR;
         if ("stopped".equals(codeString))
           return STOPPED;
-        if ("superceded".equals(codeString))
-          return SUPERCEDED;
+        if ("superseded".equals(codeString))
+          return SUPERSEDED;
         if ("draft".equals(codeString))
           return DRAFT;
         throw new Exception("Unknown MedicationPrescriptionStatus code '"+codeString+"'");
@@ -105,20 +105,20 @@ public class MedicationPrescription extends DomainResource {
             case COMPLETED: return "completed";
             case ENTEREDINERROR: return "entered-in-error";
             case STOPPED: return "stopped";
-            case SUPERCEDED: return "superceded";
+            case SUPERSEDED: return "superseded";
             case DRAFT: return "draft";
             default: return "?";
           }
         }
         public String getSystem() {
           switch (this) {
-            case ACTIVE: return "http://hl7.org.fhir/medication-prescription-status";
-            case ONHOLD: return "http://hl7.org.fhir/medication-prescription-status";
-            case COMPLETED: return "http://hl7.org.fhir/medication-prescription-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/medication-prescription-status";
-            case STOPPED: return "http://hl7.org.fhir/medication-prescription-status";
-            case SUPERCEDED: return "http://hl7.org.fhir/medication-prescription-status";
-            case DRAFT: return "http://hl7.org.fhir/medication-prescription-status";
+            case ACTIVE: return "http://hl7.org/fhir/medication-prescription-status";
+            case ONHOLD: return "http://hl7.org/fhir/medication-prescription-status";
+            case COMPLETED: return "http://hl7.org/fhir/medication-prescription-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/medication-prescription-status";
+            case STOPPED: return "http://hl7.org/fhir/medication-prescription-status";
+            case SUPERSEDED: return "http://hl7.org/fhir/medication-prescription-status";
+            case DRAFT: return "http://hl7.org/fhir/medication-prescription-status";
             default: return "?";
           }
         }
@@ -129,7 +129,7 @@ public class MedicationPrescription extends DomainResource {
             case COMPLETED: return "All actions that are implied by the prescription have occurred (this will rarely be made explicit).";
             case ENTEREDINERROR: return "The prescription was entered in error and therefore nullified.";
             case STOPPED: return "Actions implied by the prescription have been permanently halted, before all of them occurred.";
-            case SUPERCEDED: return "The prescription was replaced by a newer one, which encompasses all the information in the previous one.";
+            case SUPERSEDED: return "The prescription was replaced by a newer one, which encompasses all the information in the previous one.";
             case DRAFT: return "The prescription is not yet 'actionable', i.e. it is a work in progress, required sign-off, need to be run through decision support.";
             default: return "?";
           }
@@ -141,7 +141,7 @@ public class MedicationPrescription extends DomainResource {
             case COMPLETED: return "Completed";
             case ENTEREDINERROR: return "Entered In Error";
             case STOPPED: return "Stopped";
-            case SUPERCEDED: return "Superceded";
+            case SUPERSEDED: return "Superseded";
             case DRAFT: return "Draft";
             default: return "?";
           }
@@ -163,8 +163,8 @@ public class MedicationPrescription extends DomainResource {
           return MedicationPrescriptionStatus.ENTEREDINERROR;
         if ("stopped".equals(codeString))
           return MedicationPrescriptionStatus.STOPPED;
-        if ("superceded".equals(codeString))
-          return MedicationPrescriptionStatus.SUPERCEDED;
+        if ("superseded".equals(codeString))
+          return MedicationPrescriptionStatus.SUPERSEDED;
         if ("draft".equals(codeString))
           return MedicationPrescriptionStatus.DRAFT;
         throw new IllegalArgumentException("Unknown MedicationPrescriptionStatus code '"+codeString+"'");
@@ -180,8 +180,8 @@ public class MedicationPrescription extends DomainResource {
         return "entered-in-error";
       if (code == MedicationPrescriptionStatus.STOPPED)
         return "stopped";
-      if (code == MedicationPrescriptionStatus.SUPERCEDED)
-        return "superceded";
+      if (code == MedicationPrescriptionStatus.SUPERSEDED)
+        return "superseded";
       if (code == MedicationPrescriptionStatus.DRAFT)
         return "draft";
       return "?";
@@ -358,6 +358,10 @@ public class MedicationPrescription extends DomainResource {
           return (DateTimeType) this.scheduled;
         }
 
+        public boolean hasScheduledDateTimeType() throws Exception { 
+          return this.scheduled instanceof DateTimeType;
+        }
+
         /**
          * @return {@link #scheduled} (The timing schedule for giving the medication to the patient.  The Schedule data type allows many different expressions, for example.  "Every  8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:";  "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".)
          */
@@ -367,6 +371,10 @@ public class MedicationPrescription extends DomainResource {
           return (Period) this.scheduled;
         }
 
+        public boolean hasScheduledPeriod() throws Exception { 
+          return this.scheduled instanceof Period;
+        }
+
         /**
          * @return {@link #scheduled} (The timing schedule for giving the medication to the patient.  The Schedule data type allows many different expressions, for example.  "Every  8 hours"; "Three times a day"; "1/2 an hour before breakfast for 10 days from 23-Dec 2011:";  "15 Oct 2013, 17 Oct 2013 and 1 Nov 2013".)
          */
@@ -376,6 +384,10 @@ public class MedicationPrescription extends DomainResource {
           return (Timing) this.scheduled;
         }
 
+        public boolean hasScheduledTiming() throws Exception { 
+          return this.scheduled instanceof Timing;
+        }
+
         public boolean hasScheduled() { 
           return this.scheduled != null && !this.scheduled.isEmpty();
         }
@@ -404,6 +416,10 @@ public class MedicationPrescription extends DomainResource {
           return (BooleanType) this.asNeeded;
         }
 
+        public boolean hasAsNeededBooleanType() throws Exception { 
+          return this.asNeeded instanceof BooleanType;
+        }
+
         /**
          * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose.  If a CodeableConcept is present, it indicates the pre-condition for taking the Medication.)
          */
@@ -413,6 +429,10 @@ public class MedicationPrescription extends DomainResource {
           return (CodeableConcept) this.asNeeded;
         }
 
+        public boolean hasAsNeededCodeableConcept() throws Exception { 
+          return this.asNeeded instanceof CodeableConcept;
+        }
+
         public boolean hasAsNeeded() { 
           return this.asNeeded != null && !this.asNeeded.isEmpty();
         }
@@ -513,6 +533,10 @@ public class MedicationPrescription extends DomainResource {
           return (Range) this.dose;
         }
 
+        public boolean hasDoseRange() throws Exception { 
+          return this.dose instanceof Range;
+        }
+
         /**
          * @return {@link #dose} (The amount of therapeutic or other substance given at one administration event.)
          */
@@ -522,6 +546,10 @@ public class MedicationPrescription extends DomainResource {
           return (Quantity) this.dose;
         }
 
+        public boolean hasDoseQuantity() throws Exception { 
+          return this.dose instanceof Quantity;
+        }
+
         public boolean hasDose() { 
           return this.dose != null && !this.dose.isEmpty();
         }
@@ -707,6 +735,10 @@ public class MedicationPrescription extends DomainResource {
           return (CodeableConcept) this.medication;
         }
 
+        public boolean hasMedicationCodeableConcept() throws Exception { 
+          return this.medication instanceof CodeableConcept;
+        }
+
         /**
          * @return {@link #medication} (Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.)
          */
@@ -716,6 +748,10 @@ public class MedicationPrescription extends DomainResource {
           return (Reference) this.medication;
         }
 
+        public boolean hasMedicationReference() throws Exception { 
+          return this.medication instanceof Reference;
+        }
+
         public boolean hasMedication() { 
           return this.medication != null && !this.medication.isEmpty();
         }
@@ -1035,7 +1071,7 @@ public class MedicationPrescription extends DomainResource {
      * A code specifying the state of the order.  Generally this will be active or completed state.
      */
     @Child(name = "status", type = {CodeType.class}, order=2, min=0, max=1)
-    @Description(shortDefinition="active | on-hold | completed | entered-in-error | stopped | superceded | draft", formalDefinition="A code specifying the state of the order.  Generally this will be active or completed state." )
+    @Description(shortDefinition="active | on-hold | completed | entered-in-error | stopped | superseded | draft", formalDefinition="A code specifying the state of the order.  Generally this will be active or completed state." )
     protected Enumeration<MedicationPrescriptionStatus> status;
 
     /**
@@ -1419,6 +1455,10 @@ public class MedicationPrescription extends DomainResource {
       return (CodeableConcept) this.reason;
     }
 
+    public boolean hasReasonCodeableConcept() throws Exception { 
+      return this.reason instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #reason} (Can be the reason or the indication for writing the prescription.)
      */
@@ -1428,6 +1468,10 @@ public class MedicationPrescription extends DomainResource {
       return (Reference) this.reason;
     }
 
+    public boolean hasReasonReference() throws Exception { 
+      return this.reason instanceof Reference;
+    }
+
     public boolean hasReason() { 
       return this.reason != null && !this.reason.isEmpty();
     }
@@ -1505,6 +1549,10 @@ public class MedicationPrescription extends DomainResource {
       return (CodeableConcept) this.medication;
     }
 
+    public boolean hasMedicationCodeableConcept() throws Exception { 
+      return this.medication instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #medication} (Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications.)
      */
@@ -1514,6 +1562,10 @@ public class MedicationPrescription extends DomainResource {
       return (Reference) this.medication;
     }
 
+    public boolean hasMedicationReference() throws Exception { 
+      return this.medication instanceof Reference;
+    }
+
     public boolean hasMedication() { 
       return this.medication != null && !this.medication.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -84,9 +84,9 @@ public class MedicationStatement extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case INPROGRESS: return "http://hl7.org.fhir/medication-statement-status";
-            case COMPLETED: return "http://hl7.org.fhir/medication-statement-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/medication-statement-status";
+            case INPROGRESS: return "http://hl7.org/fhir/medication-statement-status";
+            case COMPLETED: return "http://hl7.org/fhir/medication-statement-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/medication-statement-status";
             default: return "?";
           }
         }
@@ -295,6 +295,10 @@ public class MedicationStatement extends DomainResource {
           return (BooleanType) this.asNeeded;
         }
 
+        public boolean hasAsNeededBooleanType() throws Exception { 
+          return this.asNeeded instanceof BooleanType;
+        }
+
         /**
          * @return {@link #asNeeded} (If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose.  If a CodeableConcept is present, it indicates the precondition for taking the Medication.)
          */
@@ -304,6 +308,10 @@ public class MedicationStatement extends DomainResource {
           return (CodeableConcept) this.asNeeded;
         }
 
+        public boolean hasAsNeededCodeableConcept() throws Exception { 
+          return this.asNeeded instanceof CodeableConcept;
+        }
+
         public boolean hasAsNeeded() { 
           return this.asNeeded != null && !this.asNeeded.isEmpty();
         }
@@ -950,6 +958,10 @@ public class MedicationStatement extends DomainResource {
       return (CodeableConcept) this.reasonForUse;
     }
 
+    public boolean hasReasonForUseCodeableConcept() throws Exception { 
+      return this.reasonForUse instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #reasonForUse} (A reason for why the medication is being/was taken.)
      */
@@ -959,6 +971,10 @@ public class MedicationStatement extends DomainResource {
       return (Reference) this.reasonForUse;
     }
 
+    public boolean hasReasonForUseReference() throws Exception { 
+      return this.reasonForUse instanceof Reference;
+    }
+
     public boolean hasReasonForUse() { 
       return this.reasonForUse != null && !this.reasonForUse.isEmpty();
     }
@@ -987,6 +1003,10 @@ public class MedicationStatement extends DomainResource {
       return (DateTimeType) this.effective;
     }
 
+    public boolean hasEffectiveDateTimeType() throws Exception { 
+      return this.effective instanceof DateTimeType;
+    }
+
     /**
      * @return {@link #effective} (The interval of time during which it is being asserted that the patient was taking the medication (or was not taking, when the 'wasNotGiven' attribute is true).)
      */
@@ -996,6 +1016,10 @@ public class MedicationStatement extends DomainResource {
       return (Period) this.effective;
     }
 
+    public boolean hasEffectivePeriod() throws Exception { 
+      return this.effective instanceof Period;
+    }
+
     public boolean hasEffective() { 
       return this.effective != null && !this.effective.isEmpty();
     }
@@ -1073,6 +1097,10 @@ public class MedicationStatement extends DomainResource {
       return (CodeableConcept) this.medication;
     }
 
+    public boolean hasMedicationCodeableConcept() throws Exception { 
+      return this.medication instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #medication} (Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications.)
      */
@@ -1082,6 +1110,10 @@ public class MedicationStatement extends DomainResource {
       return (Reference) this.medication;
     }
 
+    public boolean hasMedicationReference() throws Exception { 
+      return this.medication instanceof Reference;
+    }
+
     public boolean hasMedication() { 
       return this.medication != null && !this.medication.isEmpty();
     }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -85,9 +85,9 @@ public class MessageHeader extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case OK: return "http://hl7.org.fhir/response-code";
-            case TRANSIENTERROR: return "http://hl7.org.fhir/response-code";
-            case FATALERROR: return "http://hl7.org.fhir/response-code";
+            case OK: return "http://hl7.org/fhir/response-code";
+            case TRANSIENTERROR: return "http://hl7.org/fhir/response-code";
+            case FATALERROR: return "http://hl7.org/fhir/response-code";
             default: return "?";
           }
         }
@@ -919,10 +919,10 @@ public class MessageHeader extends DomainResource {
     protected InstantType timestamp;
 
     /**
-     * Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value "http://hl7.org/fhir/message-type".
+     * Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value "http://hl7.org/fhir/message-events".
      */
     @Child(name = "event", type = {Coding.class}, order=2, min=1, max=1)
-    @Description(shortDefinition="Code for the event this message represents", formalDefinition="Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value 'http://hl7.org/fhir/message-type'." )
+    @Description(shortDefinition="Code for the event this message represents", formalDefinition="Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value 'http://hl7.org/fhir/message-events'." )
     protected Coding event;
 
     /**
@@ -1124,7 +1124,7 @@ public class MessageHeader extends DomainResource {
     }
 
     /**
-     * @return {@link #event} (Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value "http://hl7.org/fhir/message-type".)
+     * @return {@link #event} (Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value "http://hl7.org/fhir/message-events".)
      */
     public Coding getEvent() { 
       if (this.event == null)
@@ -1140,7 +1140,7 @@ public class MessageHeader extends DomainResource {
     }
 
     /**
-     * @param value {@link #event} (Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value "http://hl7.org/fhir/message-type".)
+     * @param value {@link #event} (Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value "http://hl7.org/fhir/message-events".)
      */
     public MessageHeader setEvent(Coding value) { 
       this.event = value;
@@ -1478,7 +1478,7 @@ public class MessageHeader extends DomainResource {
         super.listChildren(childrenList);
         childrenList.add(new Property("identifier", "id", "The identifier of this message.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("timestamp", "instant", "The time that the message was sent.", 0, java.lang.Integer.MAX_VALUE, timestamp));
-        childrenList.add(new Property("event", "Coding", "Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value 'http://hl7.org/fhir/message-type'.", 0, java.lang.Integer.MAX_VALUE, event));
+        childrenList.add(new Property("event", "Coding", "Code that identifies the event this message represents and connects it with its definition. Events defined as part of the FHIR specification have the system value 'http://hl7.org/fhir/message-events'.", 0, java.lang.Integer.MAX_VALUE, event));
         childrenList.add(new Property("response", "", "Information about the message that this message is a response to.  Only present if this message is a response.", 0, java.lang.Integer.MAX_VALUE, response));
         childrenList.add(new Property("source", "", "The source application from which this message originated.", 0, java.lang.Integer.MAX_VALUE, source));
         childrenList.add(new Property("destination", "", "The destination application which the message is intended for.", 0, java.lang.Integer.MAX_VALUE, destination));

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import org.hl7.fhir.instance.model.annotations.DatatypeDef;
 import org.hl7.fhir.instance.model.annotations.Block;

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -85,9 +85,9 @@ public class NamingSystem extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case CODESYSTEM: return "http://hl7.org.fhir/namingsystem-type";
-            case IDENTIFIER: return "http://hl7.org.fhir/namingsystem-type";
-            case ROOT: return "http://hl7.org.fhir/namingsystem-type";
+            case CODESYSTEM: return "http://hl7.org/fhir/namingsystem-type";
+            case IDENTIFIER: return "http://hl7.org/fhir/namingsystem-type";
+            case ROOT: return "http://hl7.org/fhir/namingsystem-type";
             default: return "?";
           }
         }
@@ -178,10 +178,10 @@ public class NamingSystem extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case OID: return "http://hl7.org.fhir/namingsystem-identifier-type";
-            case UUID: return "http://hl7.org.fhir/namingsystem-identifier-type";
-            case URI: return "http://hl7.org.fhir/namingsystem-identifier-type";
-            case OTHER: return "http://hl7.org.fhir/namingsystem-identifier-type";
+            case OID: return "http://hl7.org/fhir/namingsystem-identifier-type";
+            case UUID: return "http://hl7.org/fhir/namingsystem-identifier-type";
+            case URI: return "http://hl7.org/fhir/namingsystem-identifier-type";
+            case OTHER: return "http://hl7.org/fhir/namingsystem-identifier-type";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 import org.hl7.fhir.utilities.xhtml.XhtmlNode;
@@ -91,10 +91,10 @@ public class Narrative extends BaseNarrative implements INarrative {
         }
         public String getSystem() {
           switch (this) {
-            case GENERATED: return "http://hl7.org.fhir/narrative-status";
-            case EXTENSIONS: return "http://hl7.org.fhir/narrative-status";
-            case ADDITIONAL: return "http://hl7.org.fhir/narrative-status";
-            case EMPTY: return "http://hl7.org.fhir/narrative-status";
+            case GENERATED: return "http://hl7.org/fhir/narrative-status";
+            case EXTENSIONS: return "http://hl7.org/fhir/narrative-status";
+            case ADDITIONAL: return "http://hl7.org/fhir/narrative-status";
+            case EMPTY: return "http://hl7.org/fhir/narrative-status";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -119,14 +119,14 @@ public class NutritionOrder extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PROPOSED: return "http://hl7.org.fhir/nutrition-order-status";
-            case DRAFT: return "http://hl7.org.fhir/nutrition-order-status";
-            case PLANNED: return "http://hl7.org.fhir/nutrition-order-status";
-            case REQUESTED: return "http://hl7.org.fhir/nutrition-order-status";
-            case ACTIVE: return "http://hl7.org.fhir/nutrition-order-status";
-            case ONHOLD: return "http://hl7.org.fhir/nutrition-order-status";
-            case COMPLETED: return "http://hl7.org.fhir/nutrition-order-status";
-            case CANCELLED: return "http://hl7.org.fhir/nutrition-order-status";
+            case PROPOSED: return "http://hl7.org/fhir/nutrition-order-status";
+            case DRAFT: return "http://hl7.org/fhir/nutrition-order-status";
+            case PLANNED: return "http://hl7.org/fhir/nutrition-order-status";
+            case REQUESTED: return "http://hl7.org/fhir/nutrition-order-status";
+            case ACTIVE: return "http://hl7.org/fhir/nutrition-order-status";
+            case ONHOLD: return "http://hl7.org/fhir/nutrition-order-status";
+            case COMPLETED: return "http://hl7.org/fhir/nutrition-order-status";
+            case CANCELLED: return "http://hl7.org/fhir/nutrition-order-status";
             default: return "?";
           }
         }
@@ -1634,6 +1634,10 @@ public class NutritionOrder extends DomainResource {
           return (Quantity) this.rate;
         }
 
+        public boolean hasRateQuantity() throws Exception { 
+          return this.rate instanceof Quantity;
+        }
+
         /**
          * @return {@link #rate} (The rate of administration of formula via a feeding pump, e.g., 60 mL per hour, according to the specified schedule.)
          */
@@ -1643,6 +1647,10 @@ public class NutritionOrder extends DomainResource {
           return (Ratio) this.rate;
         }
 
+        public boolean hasRateRatio() throws Exception { 
+          return this.rate instanceof Ratio;
+        }
+
         public boolean hasRate() { 
           return this.rate != null && !this.rate.isEmpty();
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -112,13 +112,13 @@ public class Observation extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case REGISTERED: return "http://hl7.org.fhir/observation-status";
-            case PRELIMINARY: return "http://hl7.org.fhir/observation-status";
-            case FINAL: return "http://hl7.org.fhir/observation-status";
-            case AMENDED: return "http://hl7.org.fhir/observation-status";
-            case CANCELLED: return "http://hl7.org.fhir/observation-status";
-            case ENTEREDINERROR: return "http://hl7.org.fhir/observation-status";
-            case UNKNOWN: return "http://hl7.org.fhir/observation-status";
+            case REGISTERED: return "http://hl7.org/fhir/observation-status";
+            case PRELIMINARY: return "http://hl7.org/fhir/observation-status";
+            case FINAL: return "http://hl7.org/fhir/observation-status";
+            case AMENDED: return "http://hl7.org/fhir/observation-status";
+            case CANCELLED: return "http://hl7.org/fhir/observation-status";
+            case ENTEREDINERROR: return "http://hl7.org/fhir/observation-status";
+            case UNKNOWN: return "http://hl7.org/fhir/observation-status";
             default: return "?";
           }
         }
@@ -254,13 +254,13 @@ public class Observation extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case OK: return "http://hl7.org.fhir/observation-reliability";
-            case ONGOING: return "http://hl7.org.fhir/observation-reliability";
-            case EARLY: return "http://hl7.org.fhir/observation-reliability";
-            case QUESTIONABLE: return "http://hl7.org.fhir/observation-reliability";
-            case CALIBRATING: return "http://hl7.org.fhir/observation-reliability";
-            case ERROR: return "http://hl7.org.fhir/observation-reliability";
-            case UNKNOWN: return "http://hl7.org.fhir/observation-reliability";
+            case OK: return "http://hl7.org/fhir/observation-reliability";
+            case ONGOING: return "http://hl7.org/fhir/observation-reliability";
+            case EARLY: return "http://hl7.org/fhir/observation-reliability";
+            case QUESTIONABLE: return "http://hl7.org/fhir/observation-reliability";
+            case CALIBRATING: return "http://hl7.org/fhir/observation-reliability";
+            case ERROR: return "http://hl7.org/fhir/observation-reliability";
+            case UNKNOWN: return "http://hl7.org/fhir/observation-reliability";
             default: return "?";
           }
         }
@@ -335,6 +335,10 @@ public class Observation extends DomainResource {
          * This observation is a group observation (e.g. a battery, a panel of tests, a set of vital sign measurements) that includes the target as a member of the group
          */
         HASMEMBER, 
+        /**
+         * The target resource (Observation or QuestionnaireAnswer) is part of the information from which this observation value is derived. (e.g. calculated anion gap, Apgar score)  NOTE:  "derived-from" is only logical choice when referencing QuestionnaireAnswer
+         */
+        DERIVEDFROM, 
         /**
          * This observation follows the target observation (e.g. timed tests such as Glucose Tolerance Test)
          */
@@ -360,6 +364,8 @@ public class Observation extends DomainResource {
                 return null;
         if ("has-member".equals(codeString))
           return HASMEMBER;
+        if ("derived-from".equals(codeString))
+          return DERIVEDFROM;
         if ("sequel-to".equals(codeString))
           return SEQUELTO;
         if ("replaces".equals(codeString))
@@ -373,6 +379,7 @@ public class Observation extends DomainResource {
         public String toCode() {
           switch (this) {
             case HASMEMBER: return "has-member";
+            case DERIVEDFROM: return "derived-from";
             case SEQUELTO: return "sequel-to";
             case REPLACES: return "replaces";
             case QUALIFIEDBY: return "qualified-by";
@@ -382,17 +389,19 @@ public class Observation extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case HASMEMBER: return "http://hl7.org.fhir/observation-relationshiptypes";
-            case SEQUELTO: return "http://hl7.org.fhir/observation-relationshiptypes";
-            case REPLACES: return "http://hl7.org.fhir/observation-relationshiptypes";
-            case QUALIFIEDBY: return "http://hl7.org.fhir/observation-relationshiptypes";
-            case INTERFEREDBY: return "http://hl7.org.fhir/observation-relationshiptypes";
+            case HASMEMBER: return "http://hl7.org/fhir/observation-relationshiptypes";
+            case DERIVEDFROM: return "http://hl7.org/fhir/observation-relationshiptypes";
+            case SEQUELTO: return "http://hl7.org/fhir/observation-relationshiptypes";
+            case REPLACES: return "http://hl7.org/fhir/observation-relationshiptypes";
+            case QUALIFIEDBY: return "http://hl7.org/fhir/observation-relationshiptypes";
+            case INTERFEREDBY: return "http://hl7.org/fhir/observation-relationshiptypes";
             default: return "?";
           }
         }
         public String getDefinition() {
           switch (this) {
             case HASMEMBER: return "This observation is a group observation (e.g. a battery, a panel of tests, a set of vital sign measurements) that includes the target as a member of the group";
+            case DERIVEDFROM: return "The target resource (Observation or QuestionnaireAnswer) is part of the information from which this observation value is derived. (e.g. calculated anion gap, Apgar score)  NOTE:  'derived-from' is only logical choice when referencing QuestionnaireAnswer";
             case SEQUELTO: return "This observation follows the target observation (e.g. timed tests such as Glucose Tolerance Test)";
             case REPLACES: return "This observation replaces a previous observation (i.e. a revised value). The target observation is now obsolete";
             case QUALIFIEDBY: return "The value of the target observation qualifies (refines) the semantics of the source observation (e.g. a lipaemia measure target from a plasma measure)";
@@ -403,6 +412,7 @@ public class Observation extends DomainResource {
         public String getDisplay() {
           switch (this) {
             case HASMEMBER: return "Has Member";
+            case DERIVEDFROM: return "Derived From";
             case SEQUELTO: return "Sequel To";
             case REPLACES: return "Replaces";
             case QUALIFIEDBY: return "Qualified By";
@@ -419,6 +429,8 @@ public class Observation extends DomainResource {
                 return null;
         if ("has-member".equals(codeString))
           return ObservationRelationshipType.HASMEMBER;
+        if ("derived-from".equals(codeString))
+          return ObservationRelationshipType.DERIVEDFROM;
         if ("sequel-to".equals(codeString))
           return ObservationRelationshipType.SEQUELTO;
         if ("replaces".equals(codeString))
@@ -432,6 +444,8 @@ public class Observation extends DomainResource {
     public String toCode(ObservationRelationshipType code) {
       if (code == ObservationRelationshipType.HASMEMBER)
         return "has-member";
+      if (code == ObservationRelationshipType.DERIVEDFROM)
+        return "derived-from";
       if (code == ObservationRelationshipType.SEQUELTO)
         return "sequel-to";
       if (code == ObservationRelationshipType.REPLACES)
@@ -687,25 +701,25 @@ public class Observation extends DomainResource {
     @Block()
     public static class ObservationRelatedComponent extends BackboneElement implements IBaseBackboneElement {
         /**
-         * A code specifying the kind of relationship that exists with the target observation.
+         * A code specifying the kind of relationship that exists with the target resource.
          */
         @Child(name = "type", type = {CodeType.class}, order=1, min=0, max=1)
-        @Description(shortDefinition="has-member | sequel-to | replaces | qualified-by | interfered-by", formalDefinition="A code specifying the kind of relationship that exists with the target observation." )
+        @Description(shortDefinition="has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by", formalDefinition="A code specifying the kind of relationship that exists with the target resource." )
         protected Enumeration<ObservationRelationshipType> type;
 
         /**
-         * A reference to the observation that is related to this observation.
+         * A reference to the observation or questionnaireanswer that is related to this observation.
          */
-        @Child(name = "target", type = {Observation.class}, order=2, min=1, max=1)
-        @Description(shortDefinition="Observation that is related to this one", formalDefinition="A reference to the observation that is related to this observation." )
+        @Child(name = "target", type = {Observation.class, QuestionnaireAnswers.class}, order=2, min=1, max=1)
+        @Description(shortDefinition="Resource that is related to this one", formalDefinition="A reference to the observation or questionnaireanswer that is related to this observation." )
         protected Reference target;
 
         /**
-         * The actual object that is the target of the reference (A reference to the observation that is related to this observation.)
+         * The actual object that is the target of the reference (A reference to the observation or questionnaireanswer that is related to this observation.)
          */
-        protected Observation targetTarget;
+        protected Resource targetTarget;
 
-        private static final long serialVersionUID = 1755337013L;
+        private static final long serialVersionUID = 1541802577L;
 
     /*
      * Constructor
@@ -723,7 +737,7 @@ public class Observation extends DomainResource {
       }
 
         /**
-         * @return {@link #type} (A code specifying the kind of relationship that exists with the target observation.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+         * @return {@link #type} (A code specifying the kind of relationship that exists with the target resource.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
          */
         public Enumeration<ObservationRelationshipType> getTypeElement() { 
           if (this.type == null)
@@ -743,7 +757,7 @@ public class Observation extends DomainResource {
         }
 
         /**
-         * @param value {@link #type} (A code specifying the kind of relationship that exists with the target observation.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+         * @param value {@link #type} (A code specifying the kind of relationship that exists with the target resource.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
          */
         public ObservationRelatedComponent setTypeElement(Enumeration<ObservationRelationshipType> value) { 
           this.type = value;
@@ -751,14 +765,14 @@ public class Observation extends DomainResource {
         }
 
         /**
-         * @return A code specifying the kind of relationship that exists with the target observation.
+         * @return A code specifying the kind of relationship that exists with the target resource.
          */
         public ObservationRelationshipType getType() { 
           return this.type == null ? null : this.type.getValue();
         }
 
         /**
-         * @param value A code specifying the kind of relationship that exists with the target observation.
+         * @param value A code specifying the kind of relationship that exists with the target resource.
          */
         public ObservationRelatedComponent setType(ObservationRelationshipType value) { 
           if (value == null)
@@ -772,7 +786,7 @@ public class Observation extends DomainResource {
         }
 
         /**
-         * @return {@link #target} (A reference to the observation that is related to this observation.)
+         * @return {@link #target} (A reference to the observation or questionnaireanswer that is related to this observation.)
          */
         public Reference getTarget() { 
           if (this.target == null)
@@ -788,7 +802,7 @@ public class Observation extends DomainResource {
         }
 
         /**
-         * @param value {@link #target} (A reference to the observation that is related to this observation.)
+         * @param value {@link #target} (A reference to the observation or questionnaireanswer that is related to this observation.)
          */
         public ObservationRelatedComponent setTarget(Reference value) { 
           this.target = value;
@@ -796,29 +810,24 @@ public class Observation extends DomainResource {
         }
 
         /**
-         * @return {@link #target} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (A reference to the observation that is related to this observation.)
+         * @return {@link #target} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (A reference to the observation or questionnaireanswer that is related to this observation.)
          */
-        public Observation getTargetTarget() { 
-          if (this.targetTarget == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create ObservationRelatedComponent.target");
-            else if (Configuration.doAutoCreate())
-              this.targetTarget = new Observation(); // aa
+        public Resource getTargetTarget() { 
           return this.targetTarget;
         }
 
         /**
-         * @param value {@link #target} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A reference to the observation that is related to this observation.)
+         * @param value {@link #target} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A reference to the observation or questionnaireanswer that is related to this observation.)
          */
-        public ObservationRelatedComponent setTargetTarget(Observation value) { 
+        public ObservationRelatedComponent setTargetTarget(Resource value) { 
           this.targetTarget = value;
           return this;
         }
 
         protected void listChildren(List<Property> childrenList) {
           super.listChildren(childrenList);
-          childrenList.add(new Property("type", "code", "A code specifying the kind of relationship that exists with the target observation.", 0, java.lang.Integer.MAX_VALUE, type));
-          childrenList.add(new Property("target", "Reference(Observation)", "A reference to the observation that is related to this observation.", 0, java.lang.Integer.MAX_VALUE, target));
+          childrenList.add(new Property("type", "code", "A code specifying the kind of relationship that exists with the target resource.", 0, java.lang.Integer.MAX_VALUE, type));
+          childrenList.add(new Property("target", "Reference(Observation|QuestionnaireAnswers)", "A reference to the observation or questionnaireanswer that is related to this observation.", 0, java.lang.Integer.MAX_VALUE, target));
         }
 
       public ObservationRelatedComponent copy() {
@@ -943,6 +952,10 @@ public class Observation extends DomainResource {
           return (Quantity) this.value;
         }
 
+        public boolean hasValueQuantity() throws Exception { 
+          return this.value instanceof Quantity;
+        }
+
         /**
          * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
          */
@@ -952,6 +965,10 @@ public class Observation extends DomainResource {
           return (CodeableConcept) this.value;
         }
 
+        public boolean hasValueCodeableConcept() throws Exception { 
+          return this.value instanceof CodeableConcept;
+        }
+
         /**
          * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
          */
@@ -961,6 +978,10 @@ public class Observation extends DomainResource {
           return (StringType) this.value;
         }
 
+        public boolean hasValueStringType() throws Exception { 
+          return this.value instanceof StringType;
+        }
+
         /**
          * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
          */
@@ -970,6 +991,10 @@ public class Observation extends DomainResource {
           return (Range) this.value;
         }
 
+        public boolean hasValueRange() throws Exception { 
+          return this.value instanceof Range;
+        }
+
         /**
          * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
          */
@@ -979,6 +1004,10 @@ public class Observation extends DomainResource {
           return (Ratio) this.value;
         }
 
+        public boolean hasValueRatio() throws Exception { 
+          return this.value instanceof Ratio;
+        }
+
         /**
          * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
          */
@@ -988,6 +1017,10 @@ public class Observation extends DomainResource {
           return (SampledData) this.value;
         }
 
+        public boolean hasValueSampledData() throws Exception { 
+          return this.value instanceof SampledData;
+        }
+
         /**
          * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
          */
@@ -997,6 +1030,10 @@ public class Observation extends DomainResource {
           return (Attachment) this.value;
         }
 
+        public boolean hasValueAttachment() throws Exception { 
+          return this.value instanceof Attachment;
+        }
+
         /**
          * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
          */
@@ -1006,6 +1043,10 @@ public class Observation extends DomainResource {
           return (TimeType) this.value;
         }
 
+        public boolean hasValueTimeType() throws Exception { 
+          return this.value instanceof TimeType;
+        }
+
         /**
          * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
          */
@@ -1015,6 +1056,10 @@ public class Observation extends DomainResource {
           return (DateTimeType) this.value;
         }
 
+        public boolean hasValueDateTimeType() throws Exception { 
+          return this.value instanceof DateTimeType;
+        }
+
         /**
          * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
          */
@@ -1024,6 +1069,10 @@ public class Observation extends DomainResource {
           return (Period) this.value;
         }
 
+        public boolean hasValuePeriod() throws Exception { 
+          return this.value instanceof Period;
+        }
+
         public boolean hasValue() { 
           return this.value != null && !this.value.isEmpty();
         }
@@ -1312,32 +1361,20 @@ other observer (for example a relative or EMT), or any observation made about th
     protected List<ObservationReferenceRangeComponent> referenceRange;
 
     /**
-     * A reference to a resource from which this observation value is derived. For example an Observation resource for a calculated anion gap or Apgar score Observation or a QuestionnaireAnswer resource for an Assessment Tool Observation.( 5/18/2015 EH: TODO need to get a specific example /use cases for example using something other than Observtion).
+     * A  reference to another resource ( usally another Observation but could  also be a QuestionnaireAnswer) whose relationship is defined by the relationship type code.
      */
-    @Child(name = "derivedFrom", type = {AllergyIntolerance.class, Condition.class, FamilyMemberHistory.class, ImagingStudy.class, Immunization.class, MedicationStatement.class, Procedure.class, QuestionnaireAnswers.class, Observation.class}, order=19, min=0, max=Child.MAX_UNLIMITED)
-    @Description(shortDefinition="The resource from which an observation is derived", formalDefinition="A reference to a resource from which this observation value is derived. For example an Observation resource for a calculated anion gap or Apgar score Observation or a QuestionnaireAnswer resource for an Assessment Tool Observation.( 5/18/2015 EH: TODO need to get a specific example /use cases for example using something other than Observtion)." )
-    protected List<Reference> derivedFrom;
-    /**
-     * The actual objects that are the target of the reference (A reference to a resource from which this observation value is derived. For example an Observation resource for a calculated anion gap or Apgar score Observation or a QuestionnaireAnswer resource for an Assessment Tool Observation.( 5/18/2015 EH: TODO need to get a specific example /use cases for example using something other than Observtion).)
-     */
-    protected List<Resource> derivedFromTarget;
-
-
-    /**
-     * A  reference to another observations whose relationship is defined by the relationship type code.
-     */
-    @Child(name = "related", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED)
-    @Description(shortDefinition="Observations related to this observation", formalDefinition="A  reference to another observations whose relationship is defined by the relationship type code." )
+    @Child(name = "related", type = {}, order=19, min=0, max=Child.MAX_UNLIMITED)
+    @Description(shortDefinition="Resource related to this observation", formalDefinition="A  reference to another resource ( usally another Observation but could  also be a QuestionnaireAnswer) whose relationship is defined by the relationship type code." )
     protected List<ObservationRelatedComponent> related;
 
     /**
      * Some observations have multiple component observations.  These component observations are expressed as separate code value pairs that share the same attributes.  Examples include systolic and diastolic component observations for blood pressure measurement and multiple component observations for for genetics observations.
      */
-    @Child(name = "component", type = {}, order=21, min=0, max=Child.MAX_UNLIMITED)
+    @Child(name = "component", type = {}, order=20, min=0, max=Child.MAX_UNLIMITED)
     @Description(shortDefinition="Component results", formalDefinition="Some observations have multiple component observations.  These component observations are expressed as separate code value pairs that share the same attributes.  Examples include systolic and diastolic component observations for blood pressure measurement and multiple component observations for for genetics observations." )
     protected List<ObservationComponentComponent> component;
 
-    private static final long serialVersionUID = -1977481392L;
+    private static final long serialVersionUID = -83023434L;
 
   /*
    * Constructor
@@ -1419,6 +1456,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (Quantity) this.value;
     }
 
+    public boolean hasValueQuantity() throws Exception { 
+      return this.value instanceof Quantity;
+    }
+
     /**
      * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
      */
@@ -1428,6 +1469,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (CodeableConcept) this.value;
     }
 
+    public boolean hasValueCodeableConcept() throws Exception { 
+      return this.value instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
      */
@@ -1437,6 +1482,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (StringType) this.value;
     }
 
+    public boolean hasValueStringType() throws Exception { 
+      return this.value instanceof StringType;
+    }
+
     /**
      * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
      */
@@ -1446,6 +1495,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (Range) this.value;
     }
 
+    public boolean hasValueRange() throws Exception { 
+      return this.value instanceof Range;
+    }
+
     /**
      * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
      */
@@ -1455,6 +1508,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (Ratio) this.value;
     }
 
+    public boolean hasValueRatio() throws Exception { 
+      return this.value instanceof Ratio;
+    }
+
     /**
      * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
      */
@@ -1464,6 +1521,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (SampledData) this.value;
     }
 
+    public boolean hasValueSampledData() throws Exception { 
+      return this.value instanceof SampledData;
+    }
+
     /**
      * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
      */
@@ -1473,6 +1534,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (Attachment) this.value;
     }
 
+    public boolean hasValueAttachment() throws Exception { 
+      return this.value instanceof Attachment;
+    }
+
     /**
      * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
      */
@@ -1482,6 +1547,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (TimeType) this.value;
     }
 
+    public boolean hasValueTimeType() throws Exception { 
+      return this.value instanceof TimeType;
+    }
+
     /**
      * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
      */
@@ -1491,6 +1560,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (DateTimeType) this.value;
     }
 
+    public boolean hasValueDateTimeType() throws Exception { 
+      return this.value instanceof DateTimeType;
+    }
+
     /**
      * @return {@link #value} (The information determined as a result of making the observation, if the information has a simple value.)
      */
@@ -1500,6 +1573,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (Period) this.value;
     }
 
+    public boolean hasValuePeriod() throws Exception { 
+      return this.value instanceof Period;
+    }
+
     public boolean hasValue() { 
       return this.value != null && !this.value.isEmpty();
     }
@@ -1625,6 +1702,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (DateTimeType) this.effective;
     }
 
+    public boolean hasEffectiveDateTimeType() throws Exception { 
+      return this.effective instanceof DateTimeType;
+    }
+
     /**
      * @return {@link #effective} (The time or time-period the observed value is asserted as being true. For biological subjects - e.g. human patients - this is usually called the "physiologically relevant time". This is usually either the time of the procedure or of specimen collection, but very often the source of the date/time is not known, only the date/time itself.)
      */
@@ -1634,6 +1715,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (Period) this.effective;
     }
 
+    public boolean hasEffectivePeriod() throws Exception { 
+      return this.effective instanceof Period;
+    }
+
     public boolean hasEffective() { 
       return this.effective != null && !this.effective.isEmpty();
     }
@@ -1805,6 +1890,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (CodeableConcept) this.bodySite;
     }
 
+    public boolean hasBodySiteCodeableConcept() throws Exception { 
+      return this.bodySite instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #bodySite} (Indicates the site on the subject's body where the observation was made ( i.e. the target site).)
      */
@@ -1814,6 +1903,10 @@ other observer (for example a relative or EMT), or any observation made about th
       return (Reference) this.bodySite;
     }
 
+    public boolean hasBodySiteReference() throws Exception { 
+      return this.bodySite instanceof Reference;
+    }
+
     public boolean hasBodySite() { 
       return this.bodySite != null && !this.bodySite.isEmpty();
     }
@@ -2150,56 +2243,7 @@ other observer (for example a relative or EMT), or any observation made about th
     }
 
     /**
-     * @return {@link #derivedFrom} (A reference to a resource from which this observation value is derived. For example an Observation resource for a calculated anion gap or Apgar score Observation or a QuestionnaireAnswer resource for an Assessment Tool Observation.( 5/18/2015 EH: TODO need to get a specific example /use cases for example using something other than Observtion).)
-     */
-    public List<Reference> getDerivedFrom() { 
-      if (this.derivedFrom == null)
-        this.derivedFrom = new ArrayList<Reference>();
-      return this.derivedFrom;
-    }
-
-    public boolean hasDerivedFrom() { 
-      if (this.derivedFrom == null)
-        return false;
-      for (Reference item : this.derivedFrom)
-        if (!item.isEmpty())
-          return true;
-      return false;
-    }
-
-    /**
-     * @return {@link #derivedFrom} (A reference to a resource from which this observation value is derived. For example an Observation resource for a calculated anion gap or Apgar score Observation or a QuestionnaireAnswer resource for an Assessment Tool Observation.( 5/18/2015 EH: TODO need to get a specific example /use cases for example using something other than Observtion).)
-     */
-    // syntactic sugar
-    public Reference addDerivedFrom() { //3
-      Reference t = new Reference();
-      if (this.derivedFrom == null)
-        this.derivedFrom = new ArrayList<Reference>();
-      this.derivedFrom.add(t);
-      return t;
-    }
-
-    // syntactic sugar
-    public Observation addDerivedFrom(Reference t) { //3
-      if (t == null)
-        return this;
-      if (this.derivedFrom == null)
-        this.derivedFrom = new ArrayList<Reference>();
-      this.derivedFrom.add(t);
-      return this;
-    }
-
-    /**
-     * @return {@link #derivedFrom} (The actual objects that are the target of the reference. The reference library doesn't populate this, but you can use this to hold the resources if you resolvethemt. A reference to a resource from which this observation value is derived. For example an Observation resource for a calculated anion gap or Apgar score Observation or a QuestionnaireAnswer resource for an Assessment Tool Observation.( 5/18/2015 EH: TODO need to get a specific example /use cases for example using something other than Observtion).)
-     */
-    public List<Resource> getDerivedFromTarget() { 
-      if (this.derivedFromTarget == null)
-        this.derivedFromTarget = new ArrayList<Resource>();
-      return this.derivedFromTarget;
-    }
-
-    /**
-     * @return {@link #related} (A  reference to another observations whose relationship is defined by the relationship type code.)
+     * @return {@link #related} (A  reference to another resource ( usally another Observation but could  also be a QuestionnaireAnswer) whose relationship is defined by the relationship type code.)
      */
     public List<ObservationRelatedComponent> getRelated() { 
       if (this.related == null)
@@ -2217,7 +2261,7 @@ other observer (for example a relative or EMT), or any observation made about th
     }
 
     /**
-     * @return {@link #related} (A  reference to another observations whose relationship is defined by the relationship type code.)
+     * @return {@link #related} (A  reference to another resource ( usally another Observation but could  also be a QuestionnaireAnswer) whose relationship is defined by the relationship type code.)
      */
     // syntactic sugar
     public ObservationRelatedComponent addRelated() { //3
@@ -2299,8 +2343,7 @@ other observer (for example a relative or EMT), or any observation made about th
         childrenList.add(new Property("device", "Reference(Device|DeviceMetric)", "The device used to generate the observation data.", 0, java.lang.Integer.MAX_VALUE, device));
         childrenList.add(new Property("encounter", "Reference(Encounter)", "The healthcare event  ( e.g. a patient and healthcare provider interaction ) during which this observation is made.", 0, java.lang.Integer.MAX_VALUE, encounter));
         childrenList.add(new Property("referenceRange", "", "Guidance on how to interpret the value by comparison to a normal or recommended range.", 0, java.lang.Integer.MAX_VALUE, referenceRange));
-        childrenList.add(new Property("derivedFrom", "Reference(AllergyIntolerance|Condition|FamilyMemberHistory|ImagingStudy|Immunization|MedicationStatement|Procedure|QuestionnaireAnswers|Observation)", "A reference to a resource from which this observation value is derived. For example an Observation resource for a calculated anion gap or Apgar score Observation or a QuestionnaireAnswer resource for an Assessment Tool Observation.( 5/18/2015 EH: TODO need to get a specific example /use cases for example using something other than Observtion).", 0, java.lang.Integer.MAX_VALUE, derivedFrom));
-        childrenList.add(new Property("related", "", "A  reference to another observations whose relationship is defined by the relationship type code.", 0, java.lang.Integer.MAX_VALUE, related));
+        childrenList.add(new Property("related", "", "A  reference to another resource ( usally another Observation but could  also be a QuestionnaireAnswer) whose relationship is defined by the relationship type code.", 0, java.lang.Integer.MAX_VALUE, related));
         childrenList.add(new Property("component", "", "Some observations have multiple component observations.  These component observations are expressed as separate code value pairs that share the same attributes.  Examples include systolic and diastolic component observations for blood pressure measurement and multiple component observations for for genetics observations.", 0, java.lang.Integer.MAX_VALUE, component));
       }
 
@@ -2338,11 +2381,6 @@ other observer (for example a relative or EMT), or any observation made about th
           for (ObservationReferenceRangeComponent i : referenceRange)
             dst.referenceRange.add(i.copy());
         };
-        if (derivedFrom != null) {
-          dst.derivedFrom = new ArrayList<Reference>();
-          for (Reference i : derivedFrom)
-            dst.derivedFrom.add(i.copy());
-        };
         if (related != null) {
           dst.related = new ArrayList<ObservationRelatedComponent>();
           for (ObservationRelatedComponent i : related)
@@ -2374,8 +2412,7 @@ other observer (for example a relative or EMT), or any observation made about th
            && compareDeep(method, o.method, true) && compareDeep(identifier, o.identifier, true) && compareDeep(subject, o.subject, true)
            && compareDeep(specimen, o.specimen, true) && compareDeep(performer, o.performer, true) && compareDeep(device, o.device, true)
            && compareDeep(encounter, o.encounter, true) && compareDeep(referenceRange, o.referenceRange, true)
-           && compareDeep(derivedFrom, o.derivedFrom, true) && compareDeep(related, o.related, true) && compareDeep(component, o.component, true)
-          ;
+           && compareDeep(related, o.related, true) && compareDeep(component, o.component, true);
       }
 
       @Override
@@ -2398,8 +2435,7 @@ other observer (for example a relative or EMT), or any observation made about th
            && (method == null || method.isEmpty()) && (identifier == null || identifier.isEmpty()) && (subject == null || subject.isEmpty())
            && (specimen == null || specimen.isEmpty()) && (performer == null || performer.isEmpty())
            && (device == null || device.isEmpty()) && (encounter == null || encounter.isEmpty()) && (referenceRange == null || referenceRange.isEmpty())
-           && (derivedFrom == null || derivedFrom.isEmpty()) && (related == null || related.isEmpty())
-           && (component == null || component.isEmpty());
+           && (related == null || related.isEmpty()) && (component == null || component.isEmpty());
       }
 
   @Override
@@ -2447,9 +2483,9 @@ other observer (for example a relative or EMT), or any observation made about th
   public static final String SP_DATAABSENTREASON = "data-absent-reason";
   @SearchParamDefinition(name="encounter", path="Observation.encounter", description="Healthcare event related to the observation", type="reference" )
   public static final String SP_ENCOUNTER = "encounter";
-  @SearchParamDefinition(name="related-type", path="Observation.related.type", description="has-member | sequel-to | replaces | qualified-by | interfered-by", type="token" )
+  @SearchParamDefinition(name="related-type", path="Observation.related.type", description="has-member | derived-from | sequel-to | replaces | qualified-by | interfered-by", type="token" )
   public static final String SP_RELATEDTYPE = "related-type";
-  @SearchParamDefinition(name="related-target", path="Observation.related.target", description="Observation that is related to this one", type="reference" )
+  @SearchParamDefinition(name="related-target", path="Observation.related.target", description="Resource that is related to this one", type="reference" )
   public static final String SP_RELATEDTARGET = "related-target";
   @SearchParamDefinition(name="component-value-string", path="Observation.component.valueString", description="The value of the component observation, if the value is a string, and also searches in CodeableConcept.text", type="string" )
   public static final String SP_COMPONENTVALUESTRING = "component-value-string";

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -78,8 +78,8 @@ public class OperationDefinition extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case OPERATION: return "http://hl7.org.fhir/operation-kind";
-            case QUERY: return "http://hl7.org.fhir/operation-kind";
+            case OPERATION: return "http://hl7.org/fhir/operation-kind";
+            case QUERY: return "http://hl7.org/fhir/operation-kind";
             default: return "?";
           }
         }
@@ -150,8 +150,8 @@ public class OperationDefinition extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case IN: return "http://hl7.org.fhir/operation-parameter-use";
-            case OUT: return "http://hl7.org.fhir/operation-parameter-use";
+            case IN: return "http://hl7.org/fhir/operation-parameter-use";
+            case OUT: return "http://hl7.org/fhir/operation-parameter-use";
             default: return "?";
           }
         }
@@ -406,14 +406,21 @@ public class OperationDefinition extends DomainResource {
          */
         protected StructureDefinition profileTarget;
 
+        /**
+         * Binds to a value set if this parameter is coded (code, Coding, CodeableConcept).
+         */
+        @Child(name = "binding", type = {}, order=8, min=0, max=1)
+        @Description(shortDefinition="ValueSet details if this is coded", formalDefinition="Binds to a value set if this parameter is coded (code, Coding, CodeableConcept)." )
+        protected OperationDefinitionParameterBindingComponent binding;
+
         /**
          * The parts of a Tuple Parameter.
          */
-        @Child(name = "part", type = {}, order=8, min=0, max=Child.MAX_UNLIMITED)
+        @Child(name = "part", type = {OperationDefinitionParameterComponent.class}, order=9, min=0, max=Child.MAX_UNLIMITED)
         @Description(shortDefinition="Parts of a Tuple Parameter", formalDefinition="The parts of a Tuple Parameter." )
-        protected List<OperationDefinitionParameterPartComponent> part;
+        protected List<OperationDefinitionParameterComponent> part;
 
-        private static final long serialVersionUID = 633191560L;
+        private static final long serialVersionUID = -1514145741L;
 
     /*
      * Constructor
@@ -755,19 +762,43 @@ public class OperationDefinition extends DomainResource {
           return this;
         }
 
+        /**
+         * @return {@link #binding} (Binds to a value set if this parameter is coded (code, Coding, CodeableConcept).)
+         */
+        public OperationDefinitionParameterBindingComponent getBinding() { 
+          if (this.binding == null)
+            if (Configuration.errorOnAutoCreate())
+              throw new Error("Attempt to auto-create OperationDefinitionParameterComponent.binding");
+            else if (Configuration.doAutoCreate())
+              this.binding = new OperationDefinitionParameterBindingComponent(); // cc
+          return this.binding;
+        }
+
+        public boolean hasBinding() { 
+          return this.binding != null && !this.binding.isEmpty();
+        }
+
+        /**
+         * @param value {@link #binding} (Binds to a value set if this parameter is coded (code, Coding, CodeableConcept).)
+         */
+        public OperationDefinitionParameterComponent setBinding(OperationDefinitionParameterBindingComponent value) { 
+          this.binding = value;
+          return this;
+        }
+
         /**
          * @return {@link #part} (The parts of a Tuple Parameter.)
          */
-        public List<OperationDefinitionParameterPartComponent> getPart() { 
+        public List<OperationDefinitionParameterComponent> getPart() { 
           if (this.part == null)
-            this.part = new ArrayList<OperationDefinitionParameterPartComponent>();
+            this.part = new ArrayList<OperationDefinitionParameterComponent>();
           return this.part;
         }
 
         public boolean hasPart() { 
           if (this.part == null)
             return false;
-          for (OperationDefinitionParameterPartComponent item : this.part)
+          for (OperationDefinitionParameterComponent item : this.part)
             if (!item.isEmpty())
               return true;
           return false;
@@ -777,20 +808,20 @@ public class OperationDefinition extends DomainResource {
          * @return {@link #part} (The parts of a Tuple Parameter.)
          */
     // syntactic sugar
-        public OperationDefinitionParameterPartComponent addPart() { //3
-          OperationDefinitionParameterPartComponent t = new OperationDefinitionParameterPartComponent();
+        public OperationDefinitionParameterComponent addPart() { //3
+          OperationDefinitionParameterComponent t = new OperationDefinitionParameterComponent();
           if (this.part == null)
-            this.part = new ArrayList<OperationDefinitionParameterPartComponent>();
+            this.part = new ArrayList<OperationDefinitionParameterComponent>();
           this.part.add(t);
           return t;
         }
 
     // syntactic sugar
-        public OperationDefinitionParameterComponent addPart(OperationDefinitionParameterPartComponent t) { //3
+        public OperationDefinitionParameterComponent addPart(OperationDefinitionParameterComponent t) { //3
           if (t == null)
             return this;
           if (this.part == null)
-            this.part = new ArrayList<OperationDefinitionParameterPartComponent>();
+            this.part = new ArrayList<OperationDefinitionParameterComponent>();
           this.part.add(t);
           return this;
         }
@@ -804,7 +835,8 @@ public class OperationDefinition extends DomainResource {
           childrenList.add(new Property("documentation", "string", "Describes the meaning or use of this parameter.", 0, java.lang.Integer.MAX_VALUE, documentation));
           childrenList.add(new Property("type", "code", "The type for this parameter.", 0, java.lang.Integer.MAX_VALUE, type));
           childrenList.add(new Property("profile", "Reference(StructureDefinition)", "A profile the specifies the rules that this parameter must conform to.", 0, java.lang.Integer.MAX_VALUE, profile));
-          childrenList.add(new Property("part", "", "The parts of a Tuple Parameter.", 0, java.lang.Integer.MAX_VALUE, part));
+          childrenList.add(new Property("binding", "", "Binds to a value set if this parameter is coded (code, Coding, CodeableConcept).", 0, java.lang.Integer.MAX_VALUE, binding));
+          childrenList.add(new Property("part", "@OperationDefinition.parameter", "The parts of a Tuple Parameter.", 0, java.lang.Integer.MAX_VALUE, part));
         }
 
       public OperationDefinitionParameterComponent copy() {
@@ -817,9 +849,10 @@ public class OperationDefinition extends DomainResource {
         dst.documentation = documentation == null ? null : documentation.copy();
         dst.type = type == null ? null : type.copy();
         dst.profile = profile == null ? null : profile.copy();
+        dst.binding = binding == null ? null : binding.copy();
         if (part != null) {
-          dst.part = new ArrayList<OperationDefinitionParameterPartComponent>();
-          for (OperationDefinitionParameterPartComponent i : part)
+          dst.part = new ArrayList<OperationDefinitionParameterComponent>();
+          for (OperationDefinitionParameterComponent i : part)
             dst.part.add(i.copy());
         };
         return dst;
@@ -834,7 +867,8 @@ public class OperationDefinition extends DomainResource {
         OperationDefinitionParameterComponent o = (OperationDefinitionParameterComponent) other;
         return compareDeep(name, o.name, true) && compareDeep(use, o.use, true) && compareDeep(min, o.min, true)
            && compareDeep(max, o.max, true) && compareDeep(documentation, o.documentation, true) && compareDeep(type, o.type, true)
-           && compareDeep(profile, o.profile, true) && compareDeep(part, o.part, true);
+           && compareDeep(profile, o.profile, true) && compareDeep(binding, o.binding, true) && compareDeep(part, o.part, true)
+          ;
       }
 
       @Override
@@ -852,373 +886,147 @@ public class OperationDefinition extends DomainResource {
       public boolean isEmpty() {
         return super.isEmpty() && (name == null || name.isEmpty()) && (use == null || use.isEmpty())
            && (min == null || min.isEmpty()) && (max == null || max.isEmpty()) && (documentation == null || documentation.isEmpty())
-           && (type == null || type.isEmpty()) && (profile == null || profile.isEmpty()) && (part == null || part.isEmpty())
-          ;
+           && (type == null || type.isEmpty()) && (profile == null || profile.isEmpty()) && (binding == null || binding.isEmpty())
+           && (part == null || part.isEmpty());
       }
 
   }
 
     @Block()
-    public static class OperationDefinitionParameterPartComponent extends BackboneElement implements IBaseBackboneElement {
+    public static class OperationDefinitionParameterBindingComponent extends BackboneElement implements IBaseBackboneElement {
         /**
-         * The name of used to identify the parameter.
+         * Indicates the degree of conformance expectations associated with this binding - that is, the degree to which the provided value set must be adhered to in the instances.
          */
-        @Child(name = "name", type = {CodeType.class}, order=1, min=1, max=1)
-        @Description(shortDefinition="Name of the parameter", formalDefinition="The name of used to identify the parameter." )
-        protected CodeType name;
+        @Child(name = "strength", type = {CodeType.class}, order=1, min=1, max=1)
+        @Description(shortDefinition="required | extensible | preferred | example", formalDefinition="Indicates the degree of conformance expectations associated with this binding - that is, the degree to which the provided value set must be adhered to in the instances." )
+        protected Enumeration<BindingStrength> strength;
 
         /**
-         * The minimum number of times this parameter SHALL appear in the request or response.
+         * Points to the value set or external definition (e.g. implicit value set) that identifies the set of codes to be used.
          */
-        @Child(name = "min", type = {UnsignedIntType.class}, order=2, min=1, max=1)
-        @Description(shortDefinition="Minimum Cardinality", formalDefinition="The minimum number of times this parameter SHALL appear in the request or response." )
-        protected UnsignedIntType min;
+        @Child(name = "valueSet", type = {UriType.class, ValueSet.class}, order=2, min=1, max=1)
+        @Description(shortDefinition="Source of value set", formalDefinition="Points to the value set or external definition (e.g. implicit value set) that identifies the set of codes to be used." )
+        protected Type valueSet;
 
-        /**
-         * The maximum number of times this element is permitted to appear in the request or response.
-         */
-        @Child(name = "max", type = {StringType.class}, order=3, min=1, max=1)
-        @Description(shortDefinition="Maximum Cardinality (a number or *)", formalDefinition="The maximum number of times this element is permitted to appear in the request or response." )
-        protected StringType max;
-
-        /**
-         * Describes the meaning or use of this parameter.
-         */
-        @Child(name = "documentation", type = {StringType.class}, order=4, min=0, max=1)
-        @Description(shortDefinition="Description of meaning/use", formalDefinition="Describes the meaning or use of this parameter." )
-        protected StringType documentation;
-
-        /**
-         * The type for this parameter.
-         */
-        @Child(name = "type", type = {CodeType.class}, order=5, min=1, max=1)
-        @Description(shortDefinition="What type this parameter hs", formalDefinition="The type for this parameter." )
-        protected CodeType type;
-
-        /**
-         * A profile the specifies the rules that this parameter must conform to.
-         */
-        @Child(name = "profile", type = {StructureDefinition.class}, order=6, min=0, max=1)
-        @Description(shortDefinition="Profile on the type", formalDefinition="A profile the specifies the rules that this parameter must conform to." )
-        protected Reference profile;
-
-        /**
-         * The actual object that is the target of the reference (A profile the specifies the rules that this parameter must conform to.)
-         */
-        protected StructureDefinition profileTarget;
-
-        private static final long serialVersionUID = -856151797L;
+        private static final long serialVersionUID = 857140521L;
 
     /*
      * Constructor
      */
-      public OperationDefinitionParameterPartComponent() {
+      public OperationDefinitionParameterBindingComponent() {
         super();
       }
 
     /*
      * Constructor
      */
-      public OperationDefinitionParameterPartComponent(CodeType name, UnsignedIntType min, StringType max, CodeType type) {
+      public OperationDefinitionParameterBindingComponent(Enumeration<BindingStrength> strength, Type valueSet) {
         super();
-        this.name = name;
-        this.min = min;
-        this.max = max;
-        this.type = type;
+        this.strength = strength;
+        this.valueSet = valueSet;
       }
 
         /**
-         * @return {@link #name} (The name of used to identify the parameter.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+         * @return {@link #strength} (Indicates the degree of conformance expectations associated with this binding - that is, the degree to which the provided value set must be adhered to in the instances.). This is the underlying object with id, value and extensions. The accessor "getStrength" gives direct access to the value
          */
-        public CodeType getNameElement() { 
-          if (this.name == null)
+        public Enumeration<BindingStrength> getStrengthElement() { 
+          if (this.strength == null)
             if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create OperationDefinitionParameterPartComponent.name");
+              throw new Error("Attempt to auto-create OperationDefinitionParameterBindingComponent.strength");
             else if (Configuration.doAutoCreate())
-              this.name = new CodeType(); // bb
-          return this.name;
+              this.strength = new Enumeration<BindingStrength>(new BindingStrengthEnumFactory()); // bb
+          return this.strength;
         }
 
-        public boolean hasNameElement() { 
-          return this.name != null && !this.name.isEmpty();
+        public boolean hasStrengthElement() { 
+          return this.strength != null && !this.strength.isEmpty();
         }
 
-        public boolean hasName() { 
-          return this.name != null && !this.name.isEmpty();
+        public boolean hasStrength() { 
+          return this.strength != null && !this.strength.isEmpty();
         }
 
         /**
-         * @param value {@link #name} (The name of used to identify the parameter.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+         * @param value {@link #strength} (Indicates the degree of conformance expectations associated with this binding - that is, the degree to which the provided value set must be adhered to in the instances.). This is the underlying object with id, value and extensions. The accessor "getStrength" gives direct access to the value
          */
-        public OperationDefinitionParameterPartComponent setNameElement(CodeType value) { 
-          this.name = value;
+        public OperationDefinitionParameterBindingComponent setStrengthElement(Enumeration<BindingStrength> value) { 
+          this.strength = value;
           return this;
         }
 
         /**
-         * @return The name of used to identify the parameter.
+         * @return Indicates the degree of conformance expectations associated with this binding - that is, the degree to which the provided value set must be adhered to in the instances.
          */
-        public String getName() { 
-          return this.name == null ? null : this.name.getValue();
+        public BindingStrength getStrength() { 
+          return this.strength == null ? null : this.strength.getValue();
         }
 
         /**
-         * @param value The name of used to identify the parameter.
+         * @param value Indicates the degree of conformance expectations associated with this binding - that is, the degree to which the provided value set must be adhered to in the instances.
          */
-        public OperationDefinitionParameterPartComponent setName(String value) { 
-            if (this.name == null)
-              this.name = new CodeType();
-            this.name.setValue(value);
+        public OperationDefinitionParameterBindingComponent setStrength(BindingStrength value) { 
+            if (this.strength == null)
+              this.strength = new Enumeration<BindingStrength>(new BindingStrengthEnumFactory());
+            this.strength.setValue(value);
           return this;
         }
 
         /**
-         * @return {@link #min} (The minimum number of times this parameter SHALL appear in the request or response.). This is the underlying object with id, value and extensions. The accessor "getMin" gives direct access to the value
+         * @return {@link #valueSet} (Points to the value set or external definition (e.g. implicit value set) that identifies the set of codes to be used.)
          */
-        public UnsignedIntType getMinElement() { 
-          if (this.min == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create OperationDefinitionParameterPartComponent.min");
-            else if (Configuration.doAutoCreate())
-              this.min = new UnsignedIntType(); // bb
-          return this.min;
-        }
-
-        public boolean hasMinElement() { 
-          return this.min != null && !this.min.isEmpty();
-        }
-
-        public boolean hasMin() { 
-          return this.min != null && !this.min.isEmpty();
+        public Type getValueSet() { 
+          return this.valueSet;
         }
 
         /**
-         * @param value {@link #min} (The minimum number of times this parameter SHALL appear in the request or response.). This is the underlying object with id, value and extensions. The accessor "getMin" gives direct access to the value
+         * @return {@link #valueSet} (Points to the value set or external definition (e.g. implicit value set) that identifies the set of codes to be used.)
          */
-        public OperationDefinitionParameterPartComponent setMinElement(UnsignedIntType value) { 
-          this.min = value;
-          return this;
+        public UriType getValueSetUriType() throws Exception { 
+          if (!(this.valueSet instanceof UriType))
+            throw new Exception("Type mismatch: the type UriType was expected, but "+this.valueSet.getClass().getName()+" was encountered");
+          return (UriType) this.valueSet;
+        }
+
+        public boolean hasValueSetUriType() throws Exception { 
+          return this.valueSet instanceof UriType;
         }
 
         /**
-         * @return The minimum number of times this parameter SHALL appear in the request or response.
+         * @return {@link #valueSet} (Points to the value set or external definition (e.g. implicit value set) that identifies the set of codes to be used.)
          */
-        public int getMin() { 
-          return this.min == null || this.min.isEmpty() ? 0 : this.min.getValue();
+        public Reference getValueSetReference() throws Exception { 
+          if (!(this.valueSet instanceof Reference))
+            throw new Exception("Type mismatch: the type Reference was expected, but "+this.valueSet.getClass().getName()+" was encountered");
+          return (Reference) this.valueSet;
+        }
+
+        public boolean hasValueSetReference() throws Exception { 
+          return this.valueSet instanceof Reference;
+        }
+
+        public boolean hasValueSet() { 
+          return this.valueSet != null && !this.valueSet.isEmpty();
         }
 
         /**
-         * @param value The minimum number of times this parameter SHALL appear in the request or response.
+         * @param value {@link #valueSet} (Points to the value set or external definition (e.g. implicit value set) that identifies the set of codes to be used.)
          */
-        public OperationDefinitionParameterPartComponent setMin(int value) { 
-            if (this.min == null)
-              this.min = new UnsignedIntType();
-            this.min.setValue(value);
-          return this;
-        }
-
-        /**
-         * @return {@link #max} (The maximum number of times this element is permitted to appear in the request or response.). This is the underlying object with id, value and extensions. The accessor "getMax" gives direct access to the value
-         */
-        public StringType getMaxElement() { 
-          if (this.max == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create OperationDefinitionParameterPartComponent.max");
-            else if (Configuration.doAutoCreate())
-              this.max = new StringType(); // bb
-          return this.max;
-        }
-
-        public boolean hasMaxElement() { 
-          return this.max != null && !this.max.isEmpty();
-        }
-
-        public boolean hasMax() { 
-          return this.max != null && !this.max.isEmpty();
-        }
-
-        /**
-         * @param value {@link #max} (The maximum number of times this element is permitted to appear in the request or response.). This is the underlying object with id, value and extensions. The accessor "getMax" gives direct access to the value
-         */
-        public OperationDefinitionParameterPartComponent setMaxElement(StringType value) { 
-          this.max = value;
-          return this;
-        }
-
-        /**
-         * @return The maximum number of times this element is permitted to appear in the request or response.
-         */
-        public String getMax() { 
-          return this.max == null ? null : this.max.getValue();
-        }
-
-        /**
-         * @param value The maximum number of times this element is permitted to appear in the request or response.
-         */
-        public OperationDefinitionParameterPartComponent setMax(String value) { 
-            if (this.max == null)
-              this.max = new StringType();
-            this.max.setValue(value);
-          return this;
-        }
-
-        /**
-         * @return {@link #documentation} (Describes the meaning or use of this parameter.). This is the underlying object with id, value and extensions. The accessor "getDocumentation" gives direct access to the value
-         */
-        public StringType getDocumentationElement() { 
-          if (this.documentation == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create OperationDefinitionParameterPartComponent.documentation");
-            else if (Configuration.doAutoCreate())
-              this.documentation = new StringType(); // bb
-          return this.documentation;
-        }
-
-        public boolean hasDocumentationElement() { 
-          return this.documentation != null && !this.documentation.isEmpty();
-        }
-
-        public boolean hasDocumentation() { 
-          return this.documentation != null && !this.documentation.isEmpty();
-        }
-
-        /**
-         * @param value {@link #documentation} (Describes the meaning or use of this parameter.). This is the underlying object with id, value and extensions. The accessor "getDocumentation" gives direct access to the value
-         */
-        public OperationDefinitionParameterPartComponent setDocumentationElement(StringType value) { 
-          this.documentation = value;
-          return this;
-        }
-
-        /**
-         * @return Describes the meaning or use of this parameter.
-         */
-        public String getDocumentation() { 
-          return this.documentation == null ? null : this.documentation.getValue();
-        }
-
-        /**
-         * @param value Describes the meaning or use of this parameter.
-         */
-        public OperationDefinitionParameterPartComponent setDocumentation(String value) { 
-          if (Utilities.noString(value))
-            this.documentation = null;
-          else {
-            if (this.documentation == null)
-              this.documentation = new StringType();
-            this.documentation.setValue(value);
-          }
-          return this;
-        }
-
-        /**
-         * @return {@link #type} (The type for this parameter.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
-         */
-        public CodeType getTypeElement() { 
-          if (this.type == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create OperationDefinitionParameterPartComponent.type");
-            else if (Configuration.doAutoCreate())
-              this.type = new CodeType(); // bb
-          return this.type;
-        }
-
-        public boolean hasTypeElement() { 
-          return this.type != null && !this.type.isEmpty();
-        }
-
-        public boolean hasType() { 
-          return this.type != null && !this.type.isEmpty();
-        }
-
-        /**
-         * @param value {@link #type} (The type for this parameter.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
-         */
-        public OperationDefinitionParameterPartComponent setTypeElement(CodeType value) { 
-          this.type = value;
-          return this;
-        }
-
-        /**
-         * @return The type for this parameter.
-         */
-        public String getType() { 
-          return this.type == null ? null : this.type.getValue();
-        }
-
-        /**
-         * @param value The type for this parameter.
-         */
-        public OperationDefinitionParameterPartComponent setType(String value) { 
-            if (this.type == null)
-              this.type = new CodeType();
-            this.type.setValue(value);
-          return this;
-        }
-
-        /**
-         * @return {@link #profile} (A profile the specifies the rules that this parameter must conform to.)
-         */
-        public Reference getProfile() { 
-          if (this.profile == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create OperationDefinitionParameterPartComponent.profile");
-            else if (Configuration.doAutoCreate())
-              this.profile = new Reference(); // cc
-          return this.profile;
-        }
-
-        public boolean hasProfile() { 
-          return this.profile != null && !this.profile.isEmpty();
-        }
-
-        /**
-         * @param value {@link #profile} (A profile the specifies the rules that this parameter must conform to.)
-         */
-        public OperationDefinitionParameterPartComponent setProfile(Reference value) { 
-          this.profile = value;
-          return this;
-        }
-
-        /**
-         * @return {@link #profile} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (A profile the specifies the rules that this parameter must conform to.)
-         */
-        public StructureDefinition getProfileTarget() { 
-          if (this.profileTarget == null)
-            if (Configuration.errorOnAutoCreate())
-              throw new Error("Attempt to auto-create OperationDefinitionParameterPartComponent.profile");
-            else if (Configuration.doAutoCreate())
-              this.profileTarget = new StructureDefinition(); // aa
-          return this.profileTarget;
-        }
-
-        /**
-         * @param value {@link #profile} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (A profile the specifies the rules that this parameter must conform to.)
-         */
-        public OperationDefinitionParameterPartComponent setProfileTarget(StructureDefinition value) { 
-          this.profileTarget = value;
+        public OperationDefinitionParameterBindingComponent setValueSet(Type value) { 
+          this.valueSet = value;
           return this;
         }
 
         protected void listChildren(List<Property> childrenList) {
           super.listChildren(childrenList);
-          childrenList.add(new Property("name", "code", "The name of used to identify the parameter.", 0, java.lang.Integer.MAX_VALUE, name));
-          childrenList.add(new Property("min", "unsignedInt", "The minimum number of times this parameter SHALL appear in the request or response.", 0, java.lang.Integer.MAX_VALUE, min));
-          childrenList.add(new Property("max", "string", "The maximum number of times this element is permitted to appear in the request or response.", 0, java.lang.Integer.MAX_VALUE, max));
-          childrenList.add(new Property("documentation", "string", "Describes the meaning or use of this parameter.", 0, java.lang.Integer.MAX_VALUE, documentation));
-          childrenList.add(new Property("type", "code", "The type for this parameter.", 0, java.lang.Integer.MAX_VALUE, type));
-          childrenList.add(new Property("profile", "Reference(StructureDefinition)", "A profile the specifies the rules that this parameter must conform to.", 0, java.lang.Integer.MAX_VALUE, profile));
+          childrenList.add(new Property("strength", "code", "Indicates the degree of conformance expectations associated with this binding - that is, the degree to which the provided value set must be adhered to in the instances.", 0, java.lang.Integer.MAX_VALUE, strength));
+          childrenList.add(new Property("valueSet[x]", "uri|Reference(ValueSet)", "Points to the value set or external definition (e.g. implicit value set) that identifies the set of codes to be used.", 0, java.lang.Integer.MAX_VALUE, valueSet));
         }
 
-      public OperationDefinitionParameterPartComponent copy() {
-        OperationDefinitionParameterPartComponent dst = new OperationDefinitionParameterPartComponent();
+      public OperationDefinitionParameterBindingComponent copy() {
+        OperationDefinitionParameterBindingComponent dst = new OperationDefinitionParameterBindingComponent();
         copyValues(dst);
-        dst.name = name == null ? null : name.copy();
-        dst.min = min == null ? null : min.copy();
-        dst.max = max == null ? null : max.copy();
-        dst.documentation = documentation == null ? null : documentation.copy();
-        dst.type = type == null ? null : type.copy();
-        dst.profile = profile == null ? null : profile.copy();
+        dst.strength = strength == null ? null : strength.copy();
+        dst.valueSet = valueSet == null ? null : valueSet.copy();
         return dst;
       }
 
@@ -1226,29 +1034,25 @@ public class OperationDefinition extends DomainResource {
       public boolean equalsDeep(Base other) {
         if (!super.equalsDeep(other))
           return false;
-        if (!(other instanceof OperationDefinitionParameterPartComponent))
+        if (!(other instanceof OperationDefinitionParameterBindingComponent))
           return false;
-        OperationDefinitionParameterPartComponent o = (OperationDefinitionParameterPartComponent) other;
-        return compareDeep(name, o.name, true) && compareDeep(min, o.min, true) && compareDeep(max, o.max, true)
-           && compareDeep(documentation, o.documentation, true) && compareDeep(type, o.type, true) && compareDeep(profile, o.profile, true)
-          ;
+        OperationDefinitionParameterBindingComponent o = (OperationDefinitionParameterBindingComponent) other;
+        return compareDeep(strength, o.strength, true) && compareDeep(valueSet, o.valueSet, true);
       }
 
       @Override
       public boolean equalsShallow(Base other) {
         if (!super.equalsShallow(other))
           return false;
-        if (!(other instanceof OperationDefinitionParameterPartComponent))
+        if (!(other instanceof OperationDefinitionParameterBindingComponent))
           return false;
-        OperationDefinitionParameterPartComponent o = (OperationDefinitionParameterPartComponent) other;
-        return compareValues(name, o.name, true) && compareValues(min, o.min, true) && compareValues(max, o.max, true)
-           && compareValues(documentation, o.documentation, true) && compareValues(type, o.type, true);
+        OperationDefinitionParameterBindingComponent o = (OperationDefinitionParameterBindingComponent) other;
+        return compareValues(strength, o.strength, true);
       }
 
       public boolean isEmpty() {
-        return super.isEmpty() && (name == null || name.isEmpty()) && (min == null || min.isEmpty())
-           && (max == null || max.isEmpty()) && (documentation == null || documentation.isEmpty()) && (type == null || type.isEmpty())
-           && (profile == null || profile.isEmpty());
+        return super.isEmpty() && (strength == null || strength.isEmpty()) && (valueSet == null || valueSet.isEmpty())
+          ;
       }
 
   }
@@ -1268,10 +1072,10 @@ public class OperationDefinition extends DomainResource {
     protected StringType version;
 
     /**
-     * A free text natural language name identifying the Profile.
+     * A free text natural language name identifying the operation.
      */
     @Child(name = "name", type = {StringType.class}, order=2, min=1, max=1)
-    @Description(shortDefinition="Informal name for this profile", formalDefinition="A free text natural language name identifying the Profile." )
+    @Description(shortDefinition="Informal name for this operation", formalDefinition="A free text natural language name identifying the operation." )
     protected StringType name;
 
     /**
@@ -1512,7 +1316,7 @@ public class OperationDefinition extends DomainResource {
     }
 
     /**
-     * @return {@link #name} (A free text natural language name identifying the Profile.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+     * @return {@link #name} (A free text natural language name identifying the operation.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
      */
     public StringType getNameElement() { 
       if (this.name == null)
@@ -1532,7 +1336,7 @@ public class OperationDefinition extends DomainResource {
     }
 
     /**
-     * @param value {@link #name} (A free text natural language name identifying the Profile.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+     * @param value {@link #name} (A free text natural language name identifying the operation.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
      */
     public OperationDefinition setNameElement(StringType value) { 
       this.name = value;
@@ -1540,14 +1344,14 @@ public class OperationDefinition extends DomainResource {
     }
 
     /**
-     * @return A free text natural language name identifying the Profile.
+     * @return A free text natural language name identifying the operation.
      */
     public String getName() { 
       return this.name == null ? null : this.name.getValue();
     }
 
     /**
-     * @param value A free text natural language name identifying the Profile.
+     * @param value A free text natural language name identifying the operation.
      */
     public OperationDefinition setName(String value) { 
         if (this.name == null)
@@ -2298,7 +2102,7 @@ public class OperationDefinition extends DomainResource {
         super.listChildren(childrenList);
         childrenList.add(new Property("url", "uri", "An absolute url that is used to identify this operation definition when it is referenced in a specification, model, design or an instance (should be globally unique uri).", 0, java.lang.Integer.MAX_VALUE, url));
         childrenList.add(new Property("version", "string", "The identifier that is used to identify this version of the profile when it is referenced in a specification, model, design or instance. This is an arbitrary value managed by the profile author manually and the value should be a timestamp.", 0, java.lang.Integer.MAX_VALUE, version));
-        childrenList.add(new Property("name", "string", "A free text natural language name identifying the Profile.", 0, java.lang.Integer.MAX_VALUE, name));
+        childrenList.add(new Property("name", "string", "A free text natural language name identifying the operation.", 0, java.lang.Integer.MAX_VALUE, name));
         childrenList.add(new Property("publisher", "string", "The name of the individual or organization that published the operation definition.", 0, java.lang.Integer.MAX_VALUE, publisher));
         childrenList.add(new Property("contact", "", "Contacts to assist a user in finding and communicating with the publisher.", 0, java.lang.Integer.MAX_VALUE, contact));
         childrenList.add(new Property("description", "string", "A free text natural language description of the profile and its use.", 0, java.lang.Integer.MAX_VALUE, description));
@@ -2423,7 +2227,7 @@ public class OperationDefinition extends DomainResource {
   public static final String SP_URL = "url";
   @SearchParamDefinition(name="system", path="OperationDefinition.system", description="Invoke at the system level?", type="token" )
   public static final String SP_SYSTEM = "system";
-  @SearchParamDefinition(name="name", path="OperationDefinition.name", description="Informal name for this profile", type="string" )
+  @SearchParamDefinition(name="name", path="OperationDefinition.name", description="Informal name for this operation", type="string" )
   public static final String SP_NAME = "name";
   @SearchParamDefinition(name="publisher", path="OperationDefinition.publisher", description="Name of the publisher (Organization or individual)", type="string" )
   public static final String SP_PUBLISHER = "publisher";

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java

@@ -29,18 +29,17 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
-import org.hl7.fhir.instance.model.annotations.Block;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.instance.model.annotations.ResourceDef;
+import org.hl7.fhir.instance.model.annotations.SearchParamDefinition;
 import org.hl7.fhir.instance.model.annotations.Child;
 import org.hl7.fhir.instance.model.annotations.Description;
-import org.hl7.fhir.instance.model.annotations.ResourceDef;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
-import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.instance.model.annotations.Block;
+import org.hl7.fhir.instance.model.api.*;
 /**
  * A collection of error, warning or information messages that result from a system action.
  */
@@ -92,10 +91,10 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu
         }
         public String getSystem() {
           switch (this) {
-            case FATAL: return "http://hl7.org.fhir/issue-severity";
-            case ERROR: return "http://hl7.org.fhir/issue-severity";
-            case WARNING: return "http://hl7.org.fhir/issue-severity";
-            case INFORMATION: return "http://hl7.org.fhir/issue-severity";
+            case FATAL: return "http://hl7.org/fhir/issue-severity";
+            case ERROR: return "http://hl7.org/fhir/issue-severity";
+            case WARNING: return "http://hl7.org/fhir/issue-severity";
+            case INFORMATION: return "http://hl7.org/fhir/issue-severity";
             default: return "?";
           }
         }

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -188,14 +188,14 @@ public class Order extends DomainResource {
     /**
      * Who initiated the order.
      */
-    @Child(name = "source", type = {Practitioner.class}, order=3, min=0, max=1)
+    @Child(name = "source", type = {Practitioner.class, Organization.class}, order=3, min=0, max=1)
     @Description(shortDefinition="Who initiated the order", formalDefinition="Who initiated the order." )
     protected Reference source;
 
     /**
      * The actual object that is the target of the reference (Who initiated the order.)
      */
-    protected Practitioner sourceTarget;
+    protected Resource sourceTarget;
 
     /**
      * Who is intended to fulfill the order.
@@ -216,29 +216,17 @@ public class Order extends DomainResource {
     @Description(shortDefinition="Text - why the order was made", formalDefinition="Text - why the order was made." )
     protected Type reason;
 
-    /**
-     * If required by policy.
-     */
-    @Child(name = "authority", type = {}, order=6, min=0, max=1)
-    @Description(shortDefinition="If required by policy", formalDefinition="If required by policy." )
-    protected Reference authority;
-
-    /**
-     * The actual object that is the target of the reference (If required by policy.)
-     */
-    protected Resource authorityTarget;
-
     /**
      * When order should be fulfilled.
      */
-    @Child(name = "when", type = {}, order=7, min=0, max=1)
+    @Child(name = "when", type = {}, order=6, min=0, max=1)
     @Description(shortDefinition="When order should be fulfilled", formalDefinition="When order should be fulfilled." )
     protected OrderWhenComponent when;
 
     /**
      * What action is being ordered.
      */
-    @Child(name = "detail", type = {}, order=8, min=1, max=Child.MAX_UNLIMITED)
+    @Child(name = "detail", type = {}, order=7, min=1, max=Child.MAX_UNLIMITED)
     @Description(shortDefinition="What action is being ordered", formalDefinition="What action is being ordered." )
     protected List<Reference> detail;
     /**
@@ -247,7 +235,7 @@ public class Order extends DomainResource {
     protected List<Resource> detailTarget;
 
 
-    private static final long serialVersionUID = 595782234L;
+    private static final long serialVersionUID = -1392311096L;
 
   /*
    * Constructor
@@ -411,19 +399,14 @@ public class Order extends DomainResource {
     /**
      * @return {@link #source} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (Who initiated the order.)
      */
-    public Practitioner getSourceTarget() { 
-      if (this.sourceTarget == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create Order.source");
-        else if (Configuration.doAutoCreate())
-          this.sourceTarget = new Practitioner(); // aa
+    public Resource getSourceTarget() { 
       return this.sourceTarget;
     }
 
     /**
      * @param value {@link #source} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (Who initiated the order.)
      */
-    public Order setSourceTarget(Practitioner value) { 
+    public Order setSourceTarget(Resource value) { 
       this.sourceTarget = value;
       return this;
     }
@@ -483,6 +466,10 @@ public class Order extends DomainResource {
       return (CodeableConcept) this.reason;
     }
 
+    public boolean hasReasonCodeableConcept() throws Exception { 
+      return this.reason instanceof CodeableConcept;
+    }
+
     /**
      * @return {@link #reason} (Text - why the order was made.)
      */
@@ -492,6 +479,10 @@ public class Order extends DomainResource {
       return (Reference) this.reason;
     }
 
+    public boolean hasReasonReference() throws Exception { 
+      return this.reason instanceof Reference;
+    }
+
     public boolean hasReason() { 
       return this.reason != null && !this.reason.isEmpty();
     }
@@ -504,45 +495,6 @@ public class Order extends DomainResource {
       return this;
     }
 
-    /**
-     * @return {@link #authority} (If required by policy.)
-     */
-    public Reference getAuthority() { 
-      if (this.authority == null)
-        if (Configuration.errorOnAutoCreate())
-          throw new Error("Attempt to auto-create Order.authority");
-        else if (Configuration.doAutoCreate())
-          this.authority = new Reference(); // cc
-      return this.authority;
-    }
-
-    public boolean hasAuthority() { 
-      return this.authority != null && !this.authority.isEmpty();
-    }
-
-    /**
-     * @param value {@link #authority} (If required by policy.)
-     */
-    public Order setAuthority(Reference value) { 
-      this.authority = value;
-      return this;
-    }
-
-    /**
-     * @return {@link #authority} The actual object that is the target of the reference. The reference library doesn't populate this, but you can use it to hold the resource if you resolve it. (If required by policy.)
-     */
-    public Resource getAuthorityTarget() { 
-      return this.authorityTarget;
-    }
-
-    /**
-     * @param value {@link #authority} The actual object that is the target of the reference. The reference library doesn't use these, but you can use it to hold the resource if you resolve it. (If required by policy.)
-     */
-    public Order setAuthorityTarget(Resource value) { 
-      this.authorityTarget = value;
-      return this;
-    }
-
     /**
      * @return {@link #when} (When order should be fulfilled.)
      */
@@ -621,10 +573,9 @@ public class Order extends DomainResource {
         childrenList.add(new Property("identifier", "Identifier", "Identifiers assigned to this order by the orderer or by the receiver.", 0, java.lang.Integer.MAX_VALUE, identifier));
         childrenList.add(new Property("date", "dateTime", "When the order was made.", 0, java.lang.Integer.MAX_VALUE, date));
         childrenList.add(new Property("subject", "Reference(Patient|Group|Device|Substance)", "Patient this order is about.", 0, java.lang.Integer.MAX_VALUE, subject));
-        childrenList.add(new Property("source", "Reference(Practitioner)", "Who initiated the order.", 0, java.lang.Integer.MAX_VALUE, source));
+        childrenList.add(new Property("source", "Reference(Practitioner|Organization)", "Who initiated the order.", 0, java.lang.Integer.MAX_VALUE, source));
         childrenList.add(new Property("target", "Reference(Organization|Device|Practitioner)", "Who is intended to fulfill the order.", 0, java.lang.Integer.MAX_VALUE, target));
         childrenList.add(new Property("reason[x]", "CodeableConcept|Reference(Any)", "Text - why the order was made.", 0, java.lang.Integer.MAX_VALUE, reason));
-        childrenList.add(new Property("authority", "Reference(Any)", "If required by policy.", 0, java.lang.Integer.MAX_VALUE, authority));
         childrenList.add(new Property("when", "", "When order should be fulfilled.", 0, java.lang.Integer.MAX_VALUE, when));
         childrenList.add(new Property("detail", "Reference(Any)", "What action is being ordered.", 0, java.lang.Integer.MAX_VALUE, detail));
       }
@@ -642,7 +593,6 @@ public class Order extends DomainResource {
         dst.source = source == null ? null : source.copy();
         dst.target = target == null ? null : target.copy();
         dst.reason = reason == null ? null : reason.copy();
-        dst.authority = authority == null ? null : authority.copy();
         dst.when = when == null ? null : when.copy();
         if (detail != null) {
           dst.detail = new ArrayList<Reference>();
@@ -665,8 +615,7 @@ public class Order extends DomainResource {
         Order o = (Order) other;
         return compareDeep(identifier, o.identifier, true) && compareDeep(date, o.date, true) && compareDeep(subject, o.subject, true)
            && compareDeep(source, o.source, true) && compareDeep(target, o.target, true) && compareDeep(reason, o.reason, true)
-           && compareDeep(authority, o.authority, true) && compareDeep(when, o.when, true) && compareDeep(detail, o.detail, true)
-          ;
+           && compareDeep(when, o.when, true) && compareDeep(detail, o.detail, true);
       }
 
       @Override
@@ -682,8 +631,8 @@ public class Order extends DomainResource {
       public boolean isEmpty() {
         return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (date == null || date.isEmpty())
            && (subject == null || subject.isEmpty()) && (source == null || source.isEmpty()) && (target == null || target.isEmpty())
-           && (reason == null || reason.isEmpty()) && (authority == null || authority.isEmpty()) && (when == null || when.isEmpty())
-           && (detail == null || detail.isEmpty());
+           && (reason == null || reason.isEmpty()) && (when == null || when.isEmpty()) && (detail == null || detail.isEmpty())
+          ;
       }
 
   @Override
@@ -693,12 +642,12 @@ public class Order extends DomainResource {
 
   @SearchParamDefinition(name="date", path="Order.date", description="When the order was made", type="date" )
   public static final String SP_DATE = "date";
+  @SearchParamDefinition(name="identifier", path="Order.identifier", description="Instance id fromsource, target, and/or  others", type="token" )
+  public static final String SP_IDENTIFIER = "identifier";
   @SearchParamDefinition(name="subject", path="Order.subject", description="Patient this order is about", type="reference" )
   public static final String SP_SUBJECT = "subject";
   @SearchParamDefinition(name="patient", path="Order.subject", description="Patient this order is about", type="reference" )
   public static final String SP_PATIENT = "patient";
-  @SearchParamDefinition(name="authority", path="Order.authority", description="If required by policy", type="reference" )
-  public static final String SP_AUTHORITY = "authority";
   @SearchParamDefinition(name="source", path="Order.source", description="Who initiated the order", type="reference" )
   public static final String SP_SOURCE = "source";
   @SearchParamDefinition(name="detail", path="Order.detail", description="What action is being ordered", type="reference" )

hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
   
 */
 
-// Generated on Sun, May 31, 2015 15:45-0400 for FHIR v0.5.0
+// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
 
 import java.util.*;
 
@@ -126,15 +126,15 @@ public class OrderResponse extends DomainResource {
         }
         public String getSystem() {
           switch (this) {
-            case PENDING: return "http://hl7.org.fhir/order-status";
-            case REVIEW: return "http://hl7.org.fhir/order-status";
-            case REJECTED: return "http://hl7.org.fhir/order-status";
-            case ERROR: return "http://hl7.org.fhir/order-status";
-            case ACCEPTED: return "http://hl7.org.fhir/order-status";
-            case CANCELLED: return "http://hl7.org.fhir/order-status";
-            case REPLACED: return "http://hl7.org.fhir/order-status";
-            case ABORTED: return "http://hl7.org.fhir/order-status";
-            case COMPLETED: return "http://hl7.org.fhir/order-status";
+            case PENDING: return "http://hl7.org/fhir/order-status";
+            case REVIEW: return "http://hl7.org/fhir/order-status";
+            case REJECTED: return "http://hl7.org/fhir/order-status";
+            case ERROR: return "http://hl7.org/fhir/order-status";
+            case ACCEPTED: return "http://hl7.org/fhir/order-status";
+            case CANCELLED: return "http://hl7.org/fhir/order-status";
+            case REPLACED: return "http://hl7.org/fhir/order-status";
+            case ABORTED: return "http://hl7.org/fhir/order-status";
+            case COMPLETED: return "http://hl7.org/fhir/order-status";
             default: return "?";
           }
         }
@@ -254,31 +254,24 @@ public class OrderResponse extends DomainResource {
      */
     protected Resource whoTarget;
 
-    /**
-     * A reference to an authority policy that is the reason for the response. Usually this is used when the order is rejected, to provide a reason for rejection.
-     */
-    @Child(name = "authority", type = {CodeableConcept.class}, order=4, min=0, max=1)
-    @Description(shortDefinition="If required by policy", formalDefinition="A reference to an authority policy that is the reason for the response. Usually this is used when the order is rejected, to provide a reason for rejection." )
-    protected Type authority;
-
     /**
      * What this response says about the status of the original order.
      */
-    @Child(name = "orderStatus", type = {CodeType.class}, order=5, min=1, max=1)
+    @Child(name = "orderStatus", type = {CodeType.class}, order=4, min=1, max=1)
     @Description(shortDefinition="pending | review | rejected | error | accepted | cancelled | replaced | aborted | completed", formalDefinition="What this response says about the status of the original order." )
     protected Enumeration<OrderStatus> orderStatus;
 
     /**
      * Additional description about the response - e.g. a text description provided by a human user when making decisions about the order.
      */
-    @Child(name = "description", type = {StringType.class}, order=6, min=0, max=1)
+    @Child(name = "description", type = {StringType.class}, order=5, min=0, max=1)
     @Description(shortDefinition="Additional description of the response", formalDefinition="Additional description about the response - e.g. a text description provided by a human user when making decisions about the order." )
     protected StringType description;
 
     /**
      * Links to resources that provide details of the outcome of performing the order. E.g. Diagnostic Reports in a response that is made to an order that referenced a diagnostic order.
      */
-    @Child(name = "fulfillment", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED)
+    @Child(name = "fulfillment", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED)
     @Description(shortDefinition="Details of the outcome of performing the order", formalDefinition="Links to resources that provide details of the outcome of performing the order. E.g. Diagnostic Reports in a response that is made to an order that referenced a diagnostic order." )
     protected List<Reference> fulfillment;
     /**
@@ -287,7 +280,7 @@ public class OrderResponse extends DomainResource {
     protected List<Resource> fulfillmentTarget;
 
 
-    private static final long serialVersionUID = -1983664888L;
+    private static final long serialVersionUID = -856633109L;
 
   /*
    * Constructor
@@ -477,43 +470,6 @@ public class OrderResponse extends DomainResource {
       return this;
     }
 
-    /**
-     * @return {@link #authority} (A reference to an authority policy that is the reason for the response. Usually this is used when the order is rejected, to provide a reason for rejection.)
-     */
-    public Type getAuthority() { 
-      return this.authority;
-    }
-
-    /**
-     * @return {@link #authority} (A reference to an authority policy that is the reason for the response. Usually this is used when the order is rejected, to provide a reason for rejection.)
-     */
-    public CodeableConcept getAuthorityCodeableConcept() throws Exception { 
-      if (!(this.authority instanceof CodeableConcept))
-        throw new Exception("Type mismatch: the type CodeableConcept was expected, but "+this.authority.getClass().getName()+" was encountered");
-      return (CodeableConcept) this.authority;
-    }
-
-    /**
-     * @return {@link #authority} (A reference to an authority policy that is the reason for the response. Usually this is used when the order is rejected, to provide a reason for rejection.)
-     */
-    public Reference getAuthorityReference() throws Exception { 
-      if (!(this.authority instanceof Reference))
-        throw new Exception("Type mismatch: the type Reference was expected, but "+this.authority.getClass().getName()+" was encountered");
-      return (Reference) this.authority;
-    }
-
-    public boolean hasAuthority() { 
-      return this.authority != null && !this.authority.isEmpty();
-    }
-
-    /**
-     * @param value {@link #authority} (A reference to an authority policy that is the reason for the response. Usually this is used when the order is rejected, to provide a reason for rejection.)
-     */
-    public OrderResponse setAuthority(Type value) { 
-      this.authority = value;
-      return this;
-    }
-
     /**
      * @return {@link #orderStatus} (What this response says about the status of the original order.). This is the underlying object with id, value and extensions. The accessor "getOrderStatus" gives direct access to the value
      */
@@ -663,7 +619,6 @@ public class OrderResponse extends DomainResource {
         childrenList.add(new Property("request", "Reference(Order)", "A reference to the order that this is in response to.", 0, java.lang.Integer.MAX_VALUE, request));
         childrenList.add(new Property("date", "dateTime", "The date and time at which this order response was made (created/posted).", 0, java.lang.Integer.MAX_VALUE, date));
         childrenList.add(new Property("who", "Reference(Practitioner|Organization|Device)", "The person, organization, or device credited with making the response.", 0, java.lang.Integer.MAX_VALUE, who));
-        childrenList.add(new Property("authority[x]", "CodeableConcept|Reference(Any)", "A reference to an authority policy that is the reason for the response. Usually this is used when the order is rejected, to provide a reason for rejection.", 0, java.lang.Integer.MAX_VALUE, authority));
         childrenList.add(new Property("orderStatus", "code", "What this response says about the status of the original order.", 0, java.lang.Integer.MAX_VALUE, orderStatus));
         childrenList.add(new Property("description", "string", "Additional description about the response - e.g. a text description provided by a human user when making decisions about the order.", 0, java.lang.Integer.MAX_VALUE, description));
         childrenList.add(new Property("fulfillment", "Reference(Any)", "Links to resources that provide details of the outcome of performing the order. E.g. Diagnostic Reports in a response that is made to an order that referenced a diagnostic order.", 0, java.lang.Integer.MAX_VALUE, fulfillment));
@@ -680,7 +635,6 @@ public class OrderResponse extends DomainResource {
         dst.request = request == null ? null : request.copy();
         dst.date = date == null ? null : date.copy();
         dst.who = who == null ? null : who.copy();
-        dst.authority = authority == null ? null : authority.copy();
         dst.orderStatus = orderStatus == null ? null : orderStatus.copy();
         dst.description = description == null ? null : description.copy();
         if (fulfillment != null) {
@@ -703,9 +657,8 @@ public class OrderResponse extends DomainResource {
           return false;
         OrderResponse o = (OrderResponse) other;
         return compareDeep(identifier, o.identifier, true) && compareDeep(request, o.request, true) && compareDeep(date, o.date, true)
-           && compareDeep(who, o.who, true) && compareDeep(authority, o.authority, true) && compareDeep(orderStatus, o.orderStatus, true)
-           && compareDeep(description, o.description, true) && compareDeep(fulfillment, o.fulfillment, true)
-          ;
+           && compareDeep(who, o.who, true) && compareDeep(orderStatus, o.orderStatus, true) && compareDeep(description, o.description, true)
+           && compareDeep(fulfillment, o.fulfillment, true);
       }
 
       @Override
@@ -721,9 +674,9 @@ public class OrderResponse extends DomainResource {
 
       public boolean isEmpty() {
         return super.isEmpty() && (identifier == null || identifier.isEmpty()) && (request == null || request.isEmpty())
-           && (date == null || date.isEmpty()) && (who == null || who.isEmpty()) && (authority == null || authority.isEmpty())
-           && (orderStatus == null || orderStatus.isEmpty()) && (description == null || description.isEmpty())
-           && (fulfillment == null || fulfillment.isEmpty());
+           && (date == null || date.isEmpty()) && (who == null || who.isEmpty()) && (orderStatus == null || orderStatus.isEmpty())
+           && (description == null || description.isEmpty()) && (fulfillment == null || fulfillment.isEmpty())
+          ;
       }
 
   @Override