* To obtain a resource validator, call {@link FhirContext#newValidator()} *
+ * + *+ * Thread safety note: This class is thread safe, so you may register or unregister validator modules at any time. Individual modules are not guaranteed to be thread safe however. Reconfigure + * them with caution. + *
*/ public class FhirValidator { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirValidator.class); - - private static final String I18N_KEY_NO_PHLOC_WARNING = FhirValidator.class.getName() + ".noPhlocWarningOnStartup"; private static final String I18N_KEY_NO_PHLOC_ERROR = FhirValidator.class.getName() + ".noPhlocError"; - private FhirContext myContext; - private Listthis for method chaining
+ */
+ public synchronized FhirValidator setValidateAgainstStandardSchema(boolean theValidateAgainstStandardSchema) {
addOrRemoveValidator(theValidateAgainstStandardSchema, SchemaBaseValidator.class, new SchemaBaseValidator(myContext));
+ return this;
}
/**
* Should the validator validate the resource against the base schematron (the schematron provided with the FHIR distribution itself)
+ *
+ * @return
+ * @return Returns a referens to this for method chaining
*/
- public void setValidateAgainstStandardSchematron(boolean theValidateAgainstStandardSchematron) {
+ public synchronized FhirValidator setValidateAgainstStandardSchematron(boolean theValidateAgainstStandardSchematron) {
if (theValidateAgainstStandardSchematron && !ourPhlocPresentOnClasspath) {
throw new IllegalArgumentException(myContext.getLocalizer().getMessage(I18N_KEY_NO_PHLOC_ERROR));
}
addOrRemoveValidator(theValidateAgainstStandardSchematron, SchematronBaseValidator.class, new SchematronBaseValidator(myContext));
+ return this;
+ }
+
+ /**
+ * Removes a validator module from this validator. You may register as many modules as you like, and remove them at any time.
+ *
+ * @param theValidator
+ * The validator module. Must not be null.
+ */
+ public synchronized void unregisterValidator(IValidator theValidator) {
+ Validate.notNull(theValidator, "theValidator must not be null");
+ ArrayList newValidators = new ArrayList(myValidators.size() + 1);
+ newValidators.addAll(myValidators);
+ newValidators.remove(theValidator);
+
+ myValidators = newValidators;
}
/**
@@ -212,4 +254,25 @@ public class FhirValidator {
return ctx.toResult();
}
+
+ /**
+ * Validates a resource instance returning a {@link ca.uhn.fhir.validation.ValidationResult} which contains the results.
+ *
+ * @param theResource
+ * the resource to validate
+ * @return the results of validation
+ * @since 1.1
+ */
+ public ValidationResult validateWithResult(String theResource) {
+ Validate.notNull(theResource, "theResource must not be null");
+
+ IValidationContext ctx = ValidationContext.forText(myContext, theResource);
+
+ for (IValidator next : myValidators) {
+ next.validateResource(ctx);
+ }
+
+ return ctx.toResult();
+ }
+
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java
index 2f46a68aec9..20f8671f14c 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java
@@ -33,8 +33,6 @@ interface IValidationContext {
EncodingEnum getResourceAsStringEncoding();
- String getResourceName();
-
void addValidationMessage(SingleValidationMessage theMessage);
ValidationResult toResult();
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java
index 1873bec27f8..0d6db2d47c9 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java
@@ -161,7 +161,7 @@ class SchemaBaseValidator implements IValidator {
private void addIssue(SAXParseException theException, ResultSeverityEnum theSeverity) {
SingleValidationMessage message = new SingleValidationMessage();
- message.setLocationRow(theException.getLineNumber());
+ message.setLocationLine(theException.getLineNumber());
message.setLocationCol(theException.getColumnNumber());
message.setMessage(theException.getLocalizedMessage());
message.setSeverity(theSeverity);
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchematronBaseValidator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchematronBaseValidator.java
index 080065f8aa0..5d7cba67e50 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchematronBaseValidator.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchematronBaseValidator.java
@@ -34,6 +34,7 @@ import org.oclc.purl.dsdl.svrl.SchematronOutputType;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.model.api.Bundle;
import ca.uhn.fhir.model.api.BundleEntry;
+import ca.uhn.fhir.rest.server.EncodingEnum;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import com.phloc.commons.error.IResourceError;
@@ -55,7 +56,13 @@ public class SchematronBaseValidator implements IValidator {
public void validateResource(IValidationContext theCtx) {
ISchematronResource sch = getSchematron(theCtx);
- StreamSource source = new StreamSource(new StringReader(theCtx.getResourceAsString()));
+ String resourceAsString;
+ if (theCtx.getResourceAsStringEncoding() == EncodingEnum.XML) {
+ resourceAsString = theCtx.getResourceAsString();
+ } else {
+ resourceAsString = theCtx.getFhirContext().newXmlParser().encodeResourceToString(theCtx.getResource());
+ }
+ StreamSource source = new StreamSource(new StringReader(resourceAsString));
SchematronOutputType results = SchematronHelper.applySchematron(sch, source);
if (results == null) {
@@ -90,7 +97,7 @@ public class SchematronBaseValidator implements IValidator {
SingleValidationMessage message = new SingleValidationMessage();
message.setMessage(details);
- message.setLocationRow(next.getLocation().getLineNumber());
+ message.setLocationLine(next.getLocation().getLineNumber());
message.setLocationCol(next.getLocation().getColumnNumber());
message.setLocationString(next.getLocation().getAsString());
message.setSeverity(severity);
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SingleValidationMessage.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SingleValidationMessage.java
index 0c98ac93af0..8b79cb317b7 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SingleValidationMessage.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SingleValidationMessage.java
@@ -28,7 +28,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
public class SingleValidationMessage {
private Integer myLocationCol;
- private Integer myLocationRow;
+ private Integer myLocationLine;
private String myLocationString;
private String myMessage;
private ResultSeverityEnum mySeverity;
@@ -47,7 +47,7 @@ public class SingleValidationMessage {
SingleValidationMessage other = (SingleValidationMessage) obj;
EqualsBuilder b = new EqualsBuilder();
b.append(myLocationCol, other.myLocationCol);
- b.append(myLocationRow, other.myLocationRow);
+ b.append(myLocationLine, other.myLocationLine);
b.append(myLocationString, other.myLocationString);
b.append(myMessage, other.myMessage);
b.append(mySeverity, other.mySeverity);
@@ -58,8 +58,8 @@ public class SingleValidationMessage {
return myLocationCol;
}
- public Integer getLocationRow() {
- return myLocationRow;
+ public Integer getLocationLine() {
+ return myLocationLine;
}
public String getLocationString() {
@@ -89,8 +89,8 @@ public class SingleValidationMessage {
myLocationCol = theLocationCol;
}
- public void setLocationRow(Integer theLocationRow) {
- myLocationRow = theLocationRow;
+ public void setLocationLine(Integer theLocationLine) {
+ myLocationLine = theLocationLine;
}
public void setLocationString(String theLocationString) {
@@ -108,9 +108,9 @@ public class SingleValidationMessage {
@Override
public String toString() {
ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE);
- if (myLocationCol != null || myLocationRow != null) {
+ if (myLocationCol != null || myLocationLine != null) {
b.append("myLocationCol", myLocationCol);
- b.append("myLocationRow", myLocationRow);
+ b.append("myLocationRow", myLocationLine);
}
if (myLocationString != null) {
b.append("myLocationString", myLocationString);
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java
index 47c1b72aa48..a7cdb87a951 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java
@@ -20,32 +20,27 @@ package ca.uhn.fhir.validation;
* #L%
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.thymeleaf.util.Validate;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.model.api.Bundle;
import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.rest.method.MethodUtil;
import ca.uhn.fhir.rest.server.EncodingEnum;
+import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
-class ValidationContext implements IValidationContext {
+class ValidationContext extends BaseValidationContext implements IValidationContext {
private final IEncoder myEncoder;
- private final FhirContext myFhirContext;
- private List myMessages = new ArrayList();
private final T myResource;
private String myResourceAsString;
private final EncodingEnum myResourceAsStringEncoding;
- private final String myResourceName;
- private ValidationContext(FhirContext theContext, T theResource, String theResourceName, IEncoder theEncoder) {
- myFhirContext = theContext;
+ private ValidationContext(FhirContext theContext, T theResource, IEncoder theEncoder) {
+ super(theContext);
myResource = theResource;
myEncoder = theEncoder;
- myResourceName = theResourceName;
if (theEncoder != null) {
myResourceAsStringEncoding = theEncoder.getEncoding();
} else {
@@ -53,17 +48,6 @@ class ValidationContext implements IValidationContext {
}
}
- @Override
- public void addValidationMessage(SingleValidationMessage theMessage) {
- Validate.notNull(theMessage, "theMessage must not be null");
- myMessages.add(theMessage);
- }
-
- @Override
- public FhirContext getFhirContext() {
- return myFhirContext;
- }
-
@Override
public T getResource() {
return myResource;
@@ -82,19 +66,8 @@ class ValidationContext implements IValidationContext {
return myResourceAsStringEncoding;
}
- @Override
- public String getResourceName() {
- return myResourceName;
- }
-
- @Override
- public ValidationResult toResult() {
- return new ValidationResult(myFhirContext, myMessages);
- }
-
public static IValidationContext forBundle(final FhirContext theContext, final Bundle theBundle) {
- String resourceName = "Bundle";
- return new ValidationContext(theContext, theBundle, resourceName, new IEncoder() {
+ return new ValidationContext(theContext, theBundle, new IEncoder() {
@Override
public String encode() {
return theContext.newXmlParser().encodeBundleToString(theBundle);
@@ -108,8 +81,7 @@ class ValidationContext implements IValidationContext {
}
public static IValidationContext forResource(final FhirContext theContext, final T theResource) {
- String resourceName = theContext.getResourceDefinition(theResource).getName();
- return new ValidationContext(theContext, theResource, resourceName, new IEncoder() {
+ return new ValidationContext(theContext, theResource, new IEncoder() {
@Override
public String encode() {
return theContext.newXmlParser().encodeResourceToString(theResource);
@@ -150,11 +122,6 @@ class ValidationContext implements IValidationContext {
return EncodingEnum.XML;
}
- @Override
- public String getResourceName() {
- return theContext.getFhirContext().getResourceDefinition(theResource).getName();
- }
-
@Override
public ValidationResult toResult() {
return theContext.toResult();
@@ -168,4 +135,39 @@ class ValidationContext implements IValidationContext {
EncodingEnum getEncoding();
}
+ public static IValidationContext forText(final FhirContext theContext, final String theResourceBody) {
+ Validate.notNull(theContext, "theContext can not be null");
+ Validate.notEmpty(theResourceBody, "theResourceBody can not be null or empty");
+ return new BaseValidationContext(theContext) {
+
+ private EncodingEnum myEncoding;
+ private IBaseResource myParsed;
+
+ @Override
+ public IBaseResource getResource() {
+ if (myParsed == null) {
+ myParsed = getResourceAsStringEncoding().newParser(getFhirContext()).parseResource(getResourceAsString());
+ }
+ return myParsed;
+ }
+
+ @Override
+ public String getResourceAsString() {
+ return theResourceBody;
+ }
+
+ @Override
+ public EncodingEnum getResourceAsStringEncoding() {
+ if (myEncoding == null) {
+ myEncoding = MethodUtil.detectEncodingNoDefault(theResourceBody);
+ if (myEncoding == null) {
+ throw new InvalidRequestException(theContext.getLocalizer().getMessage(ValidationContext.class, "unableToDetermineEncoding"));
+ }
+ }
+ return myEncoding;
+ }
+
+ };
+ }
+
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java
index a69cf3b0467..cf5dd675278 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java
@@ -96,8 +96,8 @@ public class ValidationResult {
String location;
if (isNotBlank(next.getLocationString())) {
location = next.getLocationString();
- } else if (next.getLocationRow() != null || next.getLocationCol() != null) {
- location = "Line[" + next.getLocationRow() + "] Col[" + next.getLocationCol() + "]";
+ } else if (next.getLocationLine() != null || next.getLocationCol() != null) {
+ location = "Line[" + next.getLocationLine() + "] Col[" + next.getLocationCol() + "]";
} else {
location = null;
}
diff --git a/hapi-fhir-base/src/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties b/hapi-fhir-base/src/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties
index 17a70cd527b..c7740d0c8ef 100644
--- a/hapi-fhir-base/src/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties
+++ b/hapi-fhir-base/src/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties
@@ -30,6 +30,7 @@ ca.uhn.fhir.parser.ParserState.wrongResourceTypeFound=Incorrect resource type fo
ca.uhn.fhir.rest.server.RestfulServer.getPagesNonHttpGet=Requests for _getpages must use HTTP GET
+ca.uhn.fhir.validation.ValidationContext.unableToDetermineEncoding=Unable to determine encoding (e.g. XML / JSON) on validation input. Is this a valid FHIR resource body?
ca.uhn.fhir.validation.FhirValidator.noPhlocWarningOnStartup=Phloc-schematron library not found on classpath, will not attempt to perform schematron validation
ca.uhn.fhir.validation.FhirValidator.noPhlocError=Phloc-schematron library not found on classpath, can not enable perform schematron validation
diff --git a/hapi-fhir-cobertura/pom.xml b/hapi-fhir-cobertura/pom.xml
index 21e0af25a17..1bd5992a66e 100644
--- a/hapi-fhir-cobertura/pom.xml
+++ b/hapi-fhir-cobertura/pom.xml
@@ -9,9 +9,9 @@
-->
ca.uhn.hapi.fhir
- hapi-deployable-pom
- 1.1
- ../hapi-deployable-pom/pom.xml
+ hapi-deployable-pom
+ 1.2-SNAPSHOT
+ ../hapi-deployable-pom/pom.xml
hapi-fhir-cobertura
@@ -23,27 +23,27 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-jpaserver-base
- 1.1
+ 1.2-SNAPSHOT
diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
index 5b1d9ab1b53..738a8f17ed2 100644
--- a/hapi-fhir-dist/pom.xml
+++ b/hapi-fhir-dist/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 1.1
+ 1.2-SNAPSHOT
../pom.xml
@@ -18,17 +18,17 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 1.1
+ 1.2-SNAPSHOT
ch.qos.logback
diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index e89fd05db10..77b70336e35 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 1.1
+ 1.2-SNAPSHOT
../hapi-deployable-pom/pom.xml
@@ -31,7 +31,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 1.1
+ 1.2-SNAPSHOT
commons-logging
@@ -42,19 +42,19 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 1.1
+ 1.2-SNAPSHOT
true
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 1.1
+ 1.2-SNAPSHOT
true
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 1.1
+ 1.2-SNAPSHOT
true
@@ -391,7 +391,7 @@
ca.uhn.hapi.fhir
hapi-tinder-plugin
- 1.1
+ 1.2-SNAPSHOT
build_dstu1
@@ -422,12 +422,12 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 1.1
+ 1.2-SNAPSHOT
diff --git a/hapi-fhir-jpaserver-example/pom.xml b/hapi-fhir-jpaserver-example/pom.xml
index 6c2379bbe7d..73a3a5fe044 100644
--- a/hapi-fhir-jpaserver-example/pom.xml
+++ b/hapi-fhir-jpaserver-example/pom.xml
@@ -12,13 +12,13 @@
ca.uhn.hapi.fhir
hapi-fhir
- 1.1
+ 1.2-SNAPSHOT
../pom.xml
ca.uhn.hapi.example
hapi-fhir-jpaserver-example
- 1.1
+ 1.2-SNAPSHOT
war
HAPI FHIR JPA Server - Example
@@ -39,19 +39,19 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 1.1
+ 1.2-SNAPSHOT
war
provided
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
index 4413ba36bf4..3d55b36529b 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 1.1
+ 1.2-SNAPSHOT
../pom.xml
@@ -18,22 +18,22 @@
ca.uhn.hapi.fhir
hapi-fhir-jpaserver-base
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 1.1
+ 1.2-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-testpage-overlay
- 1.1
+ 1.2-SNAPSHOT
war
provided
diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml
index b38866caa92..e43652d4ee8 100644
--- a/hapi-fhir-structures-dstu/pom.xml
+++ b/hapi-fhir-structures-dstu/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 1.1
+ 1.2-SNAPSHOT
../hapi-deployable-pom/pom.xml
@@ -18,7 +18,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 1.1
+ 1.2-SNAPSHOT
@@ -189,7 +189,7 @@
ca.uhn.hapi.fhir
hapi-tinder-plugin
- 1.1
+ 1.2-SNAPSHOT
diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml
index 2d9675e6fd0..3e77cc10f56 100644
--- a/hapi-fhir-structures-dstu2/pom.xml
+++ b/hapi-fhir-structures-dstu2/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 1.1
+ 1.2-SNAPSHOT
../hapi-deployable-pom/pom.xml
@@ -18,7 +18,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 1.1
+ 1.2-SNAPSHOT
@@ -177,7 +177,7 @@
ca.uhn.hapi.fhir
hapi-tinder-plugin
- 1.1
+ 1.2-SNAPSHOT
diff --git a/hapi-fhir-structures-hl7org-dstu2/pom.xml b/hapi-fhir-structures-hl7org-dstu2/pom.xml
index 583d85dd121..92bb302c275 100644
--- a/hapi-fhir-structures-hl7org-dstu2/pom.xml
+++ b/hapi-fhir-structures-hl7org-dstu2/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 1.1
+ 1.2-SNAPSHOT
../hapi-deployable-pom/pom.xml
@@ -18,7 +18,7 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 1.1
+ 1.2-SNAPSHOT
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java
index 878cdbe8264..0641cfea2c0 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java
@@ -68,6 +68,7 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory {
private Bundle myBundle;
private FhirContext myContext;
+ private String myBase;
public Dstu2Hl7OrgBundleFactory(FhirContext theContext) {
myContext = theContext;
@@ -180,10 +181,8 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory {
myBundle.addLink().setRelation("self").setUrl(theCompleteUrl);
}
- if (isBlank(myBundle.getBase()) && isNotBlank(theServerBase)) {
- myBundle.setBase(theServerBase);
- }
-
+ myBase = theServerBase;
+
if (myBundle.getTypeElement().isEmpty() && theBundleType != null) {
myBundle.getTypeElement().setValueAsString(theBundleType.getCode());
}
@@ -307,14 +306,14 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory {
nextEntry.setResource((Resource) next);
if (next.getIdElement().isEmpty()) {
- nextEntry.getTransaction().setMethod(HTTPVerb.POST);
+ nextEntry.getRequest().setMethod(HTTPVerb.POST);
} else {
- nextEntry.getTransaction().setMethod(HTTPVerb.PUT);
+ nextEntry.getRequest().setMethod(HTTPVerb.PUT);
if (next.getIdElement().isAbsolute()) {
- nextEntry.getTransaction().setUrl(next.getIdElement().getValue());
+ nextEntry.getRequest().setUrl(next.getIdElement().getValue());
} else {
String resourceType = myContext.getResourceDefinition(next).getName();
- nextEntry.getTransaction().setUrl(new IdType(theServerBase, resourceType, next.getIdElement().getIdPart(), next.getIdElement().getVersionIdPart()).getValue());
+ nextEntry.getRequest().setUrl(new IdType(theServerBase, resourceType, next.getIdElement().getIdPart(), next.getIdElement().getVersionIdPart()).getValue());
}
}
}
@@ -383,7 +382,11 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory {
} while (references.isEmpty() == false);
- myBundle.addEntry().setResource((Resource) next);
+ BundleEntryComponent entry = myBundle.addEntry().setResource((Resource) next);
+ IdType nextId = (IdType) next.getIdElement();
+ if (isNotBlank(myBase) && isNotBlank(nextId.getResourceType())) {
+ entry.setFullUrlElement(nextId.withServerBase(myBase, nextId.getResourceType()));
+ }
}
@@ -406,8 +409,8 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory {
for (BundleEntryComponent next : myBundle.getEntry()) {
if (next.getResource() != null) {
retVal.add(next.getResource());
- } else if (next.getTransactionResponse().getLocationElement().isEmpty() == false) {
- IdType id = new IdType(next.getTransactionResponse().getLocation());
+ } else if (next.getResponse().getLocationElement().isEmpty() == false) {
+ IdType id = new IdType(next.getResponse().getLocation());
String resourceType = id.getResourceType();
if (isNotBlank(resourceType)) {
IBaseResource res = (IBaseResource) myContext.getResourceDefinition(resourceType).newInstance();
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java
index b42e0985da1..f021864aa27 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/validation/FhirInstanceValidator.java
@@ -1,7 +1,10 @@
package ca.uhn.fhir.validation;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
import java.io.IOException;
import java.io.StringReader;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -15,30 +18,32 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.instance.utils.WorkerContext;
import org.hl7.fhir.instance.validation.ValidationMessage;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-
import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.model.api.Bundle;
import ca.uhn.fhir.rest.server.EncodingEnum;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+
public class FhirInstanceValidator implements IValidator {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirInstanceValidator.class);
private DocumentBuilderFactory myDocBuilderFactory;
- FhirInstanceValidator() {
+ public FhirInstanceValidator() {
myDocBuilderFactory = DocumentBuilderFactory.newInstance();
myDocBuilderFactory.setNamespaceAware(true);
}
- List validate(FhirContext theCtx, String theInput, EncodingEnum theEncoding, String theResourceName) {
+ List validate(FhirContext theCtx, String theInput, EncodingEnum theEncoding) {
WorkerContext workerContext = new WorkerContext();
org.hl7.fhir.instance.validation.InstanceValidator v;
try {
@@ -47,14 +52,7 @@ public class FhirInstanceValidator implements IValidator {
throw new ConfigurationException(e);
}
- String profileCpName = "/org/hl7/fhir/instance/model/profile/" + theResourceName.toLowerCase() + ".profile.xml";
- String profileText;
- try {
- profileText = IOUtils.toString(FhirInstanceValidator.class.getResourceAsStream(profileCpName), "UTF-8");
- } catch (IOException e1) {
- throw new ConfigurationException("Failed to load profile from classpath: " + profileCpName, e1);
- }
- StructureDefinition profile = theCtx.newXmlParser().parseResource(StructureDefinition.class, profileText);
+ List messages = new ArrayList();
if (theEncoding == EncodingEnum.XML) {
Document document;
@@ -69,31 +67,86 @@ public class FhirInstanceValidator implements IValidator {
m.setMessage("Failed to parse input, it does not appear to be valid XML:" + e2.getMessage());
return Collections.singletonList(m);
}
- try {
- List results = v.validate(document, profile);
- return results;
- } catch (Exception e) {
- throw new InternalErrorException("Unexpected failure while validating resource", e);
+
+ String resourceName = determineResourceName(document);
+ StructureDefinition profile = loadProfileOrReturnNull(messages, theCtx, resourceName);
+ if (profile != null) {
+ try {
+ v.validate(messages, document, profile);
+ } catch (Exception e) {
+ throw new InternalErrorException("Unexpected failure while validating resource", e);
+ }
}
} else if (theEncoding == EncodingEnum.JSON) {
Gson gson = new GsonBuilder().create();
JsonObject json = gson.fromJson(theInput, JsonObject.class);
- try {
- return v.validate(json, profile);
- } catch (Exception e) {
- throw new InternalErrorException("Unexpected failure while validating resource", e);
+
+ String resourceName = json.get("resourceType").getAsString();
+ StructureDefinition profile = loadProfileOrReturnNull(messages, theCtx, resourceName);
+ if (profile != null) {
+ try {
+ v.validate(messages, json, profile);
+ } catch (Exception e) {
+ throw new InternalErrorException("Unexpected failure while validating resource", e);
+ }
}
} else {
throw new IllegalArgumentException("Unknown encoding: " + theEncoding);
}
+ return messages;
+ }
+
+ private StructureDefinition loadProfileOrReturnNull(List theMessages, FhirContext theCtx, String theResourceName) {
+ if (isBlank(theResourceName)) {
+ theMessages.add(new ValidationMessage().setLevel(IssueSeverity.FATAL).setMessage("Could not determine resource type from request. Content appears invalid."));
+ return null;
+ }
+
+ String profileCpName = "/org/hl7/fhir/instance/model/profile/" + theResourceName.toLowerCase() + ".profile.xml";
+ String profileText;
+ try {
+ profileText = IOUtils.toString(FhirInstanceValidator.class.getResourceAsStream(profileCpName), "UTF-8");
+ } catch (IOException e1) {
+ theMessages.add(new ValidationMessage().setLevel(IssueSeverity.FATAL).setMessage("No profile found for resource type " + theResourceName));
+ return null;
+ }
+ StructureDefinition profile = theCtx.newXmlParser().parseResource(StructureDefinition.class, profileText);
+ return profile;
+ }
+
+ private String determineResourceName(Document theDocument) {
+ Element root = null;
+
+ NodeList list = theDocument.getChildNodes();
+ for (int i = 0; i < list.getLength(); i++) {
+ if (list.item(i) instanceof Element) {
+ root = (Element) list.item(i);
+ break;
+ }
+ }
+ root = theDocument.getDocumentElement();
+ return root.getLocalName();
}
@Override
public void validateResource(IValidationContext theCtx) {
- String resourceName = theCtx.getResourceName();
- String resourceBody = theCtx.getResourceAsString();
- validate(theCtx.getFhirContext(), resourceBody, theCtx.getResourceAsStringEncoding(), resourceName);
+ List messages = validate(theCtx.getFhirContext(), theCtx.getResourceAsString(), theCtx.getResourceAsStringEncoding());
+ for (ValidationMessage riMessage : messages) {
+ SingleValidationMessage hapiMessage = new SingleValidationMessage();
+ if (riMessage.getCol() != -1) {
+ hapiMessage.setLocationCol(riMessage.getCol());
+ }
+ if (riMessage.getLine() != -1) {
+ hapiMessage.setLocationLine(riMessage.getLine());
+ }
+ hapiMessage.setLocationString(riMessage.getLocation());
+ hapiMessage.setMessage(riMessage.getMessage());
+ if (riMessage.getLevel() != null) {
+ hapiMessage.setSeverity(ResultSeverityEnum.fromCode(riMessage.getLevel().toCode()));
+ }
+ theCtx.addValidationMessage(hapiMessage);
+ }
}
@Override
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java
index d21a98ca4d0..b97bacba09b 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java
index 9577601ea66..a732bf97b98 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java
index 6ad0c29e724..c1a4aa8d170 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 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;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java
index c0b419de82e..5917e494b64 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java
index 867c84378dc..d34ef4ae249 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Annotation.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java
index 1a635edcecb..d7da5cb1da0 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java
index 5e4a302118d..a6c328dc52a 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java
index c5b73994363..20c32a3ea05 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java
index b721c927b31..d07085c741a 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java
index 4dee3dc6d09..3f6219f06c0 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java
index ff8c57ab0f6..5f59e705534 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Basic.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java
index 998ee0b5e18..c7dd5d3ec5e 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Binary.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java
index dbf4e239322..dac9ba264c3 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java
index 4d0d931c040..d7be6ec2006 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -61,9 +61,17 @@ public class Bundle extends Resource implements IBaseBundle {
*/
TRANSACTION,
/**
- * The bundle is a transaction response
+ * The bundle is a transaction response. Because the response is a transaction response, the transactionhas succeeded, and all responses are error free
*/
TRANSACTIONRESPONSE,
+ /**
+ * The bundle is a transaction - intended to be processed by a server as a group of actions
+ */
+ BATCH,
+ /**
+ * The bundle is a batch response. Note that as a batch, some responses may indicate failure and others success
+ */
+ BATCHRESPONSE,
/**
* The bundle is a list of resources from a _history interaction on a server
*/
@@ -91,6 +99,10 @@ public class Bundle extends Resource implements IBaseBundle {
return TRANSACTION;
if ("transaction-response".equals(codeString))
return TRANSACTIONRESPONSE;
+ if ("batch".equals(codeString))
+ return BATCH;
+ if ("batch-response".equals(codeString))
+ return BATCHRESPONSE;
if ("history".equals(codeString))
return HISTORY;
if ("searchset".equals(codeString))
@@ -105,6 +117,8 @@ public class Bundle extends Resource implements IBaseBundle {
case MESSAGE: return "message";
case TRANSACTION: return "transaction";
case TRANSACTIONRESPONSE: return "transaction-response";
+ case BATCH: return "batch";
+ case BATCHRESPONSE: return "batch-response";
case HISTORY: return "history";
case SEARCHSET: return "searchset";
case COLLECTION: return "collection";
@@ -117,6 +131,8 @@ public class Bundle extends Resource implements IBaseBundle {
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 BATCH: return "http://hl7.org/fhir/bundle-type";
+ case BATCHRESPONSE: 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";
@@ -128,7 +144,9 @@ public class Bundle extends Resource implements IBaseBundle {
case DOCUMENT: return "The bundle is a document. The first resource is a Composition";
case MESSAGE: return "The bundle is a message. The first resource is a MessageHeader";
case TRANSACTION: return "The bundle is a transaction - intended to be processed by a server as an atomic commit";
- case TRANSACTIONRESPONSE: return "The bundle is a transaction response";
+ case TRANSACTIONRESPONSE: return "The bundle is a transaction response. Because the response is a transaction response, the transactionhas succeeded, and all responses are error free";
+ case BATCH: return "The bundle is a transaction - intended to be processed by a server as a group of actions";
+ case BATCHRESPONSE: return "The bundle is a batch response. Note that as a batch, some responses may indicate failure and others success";
case HISTORY: return "The bundle is a list of resources from a _history interaction on a server";
case SEARCHSET: return "The bundle is a list of resources returned as a result of a search/query interaction, operation, or message";
case COLLECTION: return "The bundle is a set of resources collected into a single document for ease of distribution";
@@ -141,6 +159,8 @@ public class Bundle extends Resource implements IBaseBundle {
case MESSAGE: return "Message";
case TRANSACTION: return "Transaction";
case TRANSACTIONRESPONSE: return "Transaction Response";
+ case BATCH: return "Batch";
+ case BATCHRESPONSE: return "Batch Response";
case HISTORY: return "History List";
case SEARCHSET: return "Search Results";
case COLLECTION: return "Collection";
@@ -162,6 +182,10 @@ public class Bundle extends Resource implements IBaseBundle {
return BundleType.TRANSACTION;
if ("transaction-response".equals(codeString))
return BundleType.TRANSACTIONRESPONSE;
+ if ("batch".equals(codeString))
+ return BundleType.BATCH;
+ if ("batch-response".equals(codeString))
+ return BundleType.BATCHRESPONSE;
if ("history".equals(codeString))
return BundleType.HISTORY;
if ("searchset".equals(codeString))
@@ -179,6 +203,10 @@ public class Bundle extends Resource implements IBaseBundle {
return "transaction";
if (code == BundleType.TRANSACTIONRESPONSE)
return "transaction-response";
+ if (code == BundleType.BATCH)
+ return "batch";
+ if (code == BundleType.BATCHRESPONSE)
+ return "batch-response";
if (code == BundleType.HISTORY)
return "history";
if (code == BundleType.SEARCHSET)
@@ -542,20 +570,20 @@ public class Bundle extends Resource implements IBaseBundle {
@Block()
public static class BundleEntryComponent extends BackboneElement implements IBaseBackboneElement {
- /**
- * The Base URL for the resource, if different to the base URL specified for the bundle as a whole.
- */
- @Child(name = "base", type = {UriType.class}, order=1, min=0, max=1)
- @Description(shortDefinition="Base URL, if different to bundle base", formalDefinition="The Base URL for the resource, if different to the base URL specified for the bundle as a whole." )
- protected UriType base;
-
/**
* A series of links that provide context to this entry.
*/
- @Child(name = "link", type = {BundleLinkComponent.class}, order=2, min=0, max=Child.MAX_UNLIMITED)
+ @Child(name = "link", type = {BundleLinkComponent.class}, order=1, min=0, max=Child.MAX_UNLIMITED)
@Description(shortDefinition="Links related to this entry", formalDefinition="A series of links that provide context to this entry." )
protected List link;
+ /**
+ * The Absolute URL for the resource. This must be provided for all resources. The fullUrl SHALL not disagree with the id in the resource. The fullUrl is a version independent reference to the resource.
+ */
+ @Child(name = "fullUrl", type = {UriType.class}, order=2, min=0, max=1)
+ @Description(shortDefinition="Absolute URL for resource (server address, or UUID/OID)", formalDefinition="The Absolute URL for the resource. This must be provided for all resources. The fullUrl SHALL not disagree with the id in the resource. The fullUrl is a version independent reference to the resource." )
+ protected UriType fullUrl;
+
/**
* The Resources for the entry.
*/
@@ -573,18 +601,18 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* Additional information about how this entry should be processed as part of a transaction.
*/
- @Child(name = "transaction", type = {}, order=5, min=0, max=1)
+ @Child(name = "request", type = {}, order=5, min=0, max=1)
@Description(shortDefinition="Transaction Related Information", formalDefinition="Additional information about how this entry should be processed as part of a transaction." )
- protected BundleEntryTransactionComponent transaction;
+ protected BundleEntryRequestComponent request;
/**
* Additional information about how this entry should be processed as part of a transaction.
*/
- @Child(name = "transactionResponse", type = {}, order=6, min=0, max=1)
+ @Child(name = "response", type = {}, order=6, min=0, max=1)
@Description(shortDefinition="Transaction Related Information", formalDefinition="Additional information about how this entry should be processed as part of a transaction." )
- protected BundleEntryTransactionResponseComponent transactionResponse;
+ protected BundleEntryResponseComponent response;
- private static final long serialVersionUID = -1846898377L;
+ private static final long serialVersionUID = 517783054L;
/*
* Constructor
@@ -593,55 +621,6 @@ public class Bundle extends Resource implements IBaseBundle {
super();
}
- /**
- * @return {@link #base} (The Base URL for the resource, if different to the base URL specified for the bundle as a whole.). This is the underlying object with id, value and extensions. The accessor "getBase" gives direct access to the value
- */
- public UriType getBaseElement() {
- if (this.base == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryComponent.base");
- else if (Configuration.doAutoCreate())
- this.base = new UriType(); // bb
- return this.base;
- }
-
- public boolean hasBaseElement() {
- return this.base != null && !this.base.isEmpty();
- }
-
- public boolean hasBase() {
- return this.base != null && !this.base.isEmpty();
- }
-
- /**
- * @param value {@link #base} (The Base URL for the resource, if different to the base URL specified for the bundle as a whole.). This is the underlying object with id, value and extensions. The accessor "getBase" gives direct access to the value
- */
- public BundleEntryComponent setBaseElement(UriType value) {
- this.base = value;
- return this;
- }
-
- /**
- * @return The Base URL for the resource, if different to the base URL specified for the bundle as a whole.
- */
- public String getBase() {
- return this.base == null ? null : this.base.getValue();
- }
-
- /**
- * @param value The Base URL for the resource, if different to the base URL specified for the bundle as a whole.
- */
- public BundleEntryComponent setBase(String value) {
- if (Utilities.noString(value))
- this.base = null;
- else {
- if (this.base == null)
- this.base = new UriType();
- this.base.setValue(value);
- }
- return this;
- }
-
/**
* @return {@link #link} (A series of links that provide context to this entry.)
*/
@@ -682,6 +661,55 @@ public class Bundle extends Resource implements IBaseBundle {
return this;
}
+ /**
+ * @return {@link #fullUrl} (The Absolute URL for the resource. This must be provided for all resources. The fullUrl SHALL not disagree with the id in the resource. The fullUrl is a version independent reference to the resource.). This is the underlying object with id, value and extensions. The accessor "getFullUrl" gives direct access to the value
+ */
+ public UriType getFullUrlElement() {
+ if (this.fullUrl == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create BundleEntryComponent.fullUrl");
+ else if (Configuration.doAutoCreate())
+ this.fullUrl = new UriType(); // bb
+ return this.fullUrl;
+ }
+
+ public boolean hasFullUrlElement() {
+ return this.fullUrl != null && !this.fullUrl.isEmpty();
+ }
+
+ public boolean hasFullUrl() {
+ return this.fullUrl != null && !this.fullUrl.isEmpty();
+ }
+
+ /**
+ * @param value {@link #fullUrl} (The Absolute URL for the resource. This must be provided for all resources. The fullUrl SHALL not disagree with the id in the resource. The fullUrl is a version independent reference to the resource.). This is the underlying object with id, value and extensions. The accessor "getFullUrl" gives direct access to the value
+ */
+ public BundleEntryComponent setFullUrlElement(UriType value) {
+ this.fullUrl = value;
+ return this;
+ }
+
+ /**
+ * @return The Absolute URL for the resource. This must be provided for all resources. The fullUrl SHALL not disagree with the id in the resource. The fullUrl is a version independent reference to the resource.
+ */
+ public String getFullUrl() {
+ return this.fullUrl == null ? null : this.fullUrl.getValue();
+ }
+
+ /**
+ * @param value The Absolute URL for the resource. This must be provided for all resources. The fullUrl SHALL not disagree with the id in the resource. The fullUrl is a version independent reference to the resource.
+ */
+ public BundleEntryComponent setFullUrl(String value) {
+ if (Utilities.noString(value))
+ this.fullUrl = null;
+ else {
+ if (this.fullUrl == null)
+ this.fullUrl = new UriType();
+ this.fullUrl.setValue(value);
+ }
+ return this;
+ }
+
/**
* @return {@link #resource} (The Resources for the entry.)
*/
@@ -726,76 +754,76 @@ public class Bundle extends Resource implements IBaseBundle {
}
/**
- * @return {@link #transaction} (Additional information about how this entry should be processed as part of a transaction.)
+ * @return {@link #request} (Additional information about how this entry should be processed as part of a transaction.)
*/
- public BundleEntryTransactionComponent getTransaction() {
- if (this.transaction == null)
+ public BundleEntryRequestComponent getRequest() {
+ if (this.request == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryComponent.transaction");
+ throw new Error("Attempt to auto-create BundleEntryComponent.request");
else if (Configuration.doAutoCreate())
- this.transaction = new BundleEntryTransactionComponent(); // cc
- return this.transaction;
+ this.request = new BundleEntryRequestComponent(); // cc
+ return this.request;
}
- public boolean hasTransaction() {
- return this.transaction != null && !this.transaction.isEmpty();
+ public boolean hasRequest() {
+ return this.request != null && !this.request.isEmpty();
}
/**
- * @param value {@link #transaction} (Additional information about how this entry should be processed as part of a transaction.)
+ * @param value {@link #request} (Additional information about how this entry should be processed as part of a transaction.)
*/
- public BundleEntryComponent setTransaction(BundleEntryTransactionComponent value) {
- this.transaction = value;
+ public BundleEntryComponent setRequest(BundleEntryRequestComponent value) {
+ this.request = value;
return this;
}
/**
- * @return {@link #transactionResponse} (Additional information about how this entry should be processed as part of a transaction.)
+ * @return {@link #response} (Additional information about how this entry should be processed as part of a transaction.)
*/
- public BundleEntryTransactionResponseComponent getTransactionResponse() {
- if (this.transactionResponse == null)
+ public BundleEntryResponseComponent getResponse() {
+ if (this.response == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryComponent.transactionResponse");
+ throw new Error("Attempt to auto-create BundleEntryComponent.response");
else if (Configuration.doAutoCreate())
- this.transactionResponse = new BundleEntryTransactionResponseComponent(); // cc
- return this.transactionResponse;
+ this.response = new BundleEntryResponseComponent(); // cc
+ return this.response;
}
- public boolean hasTransactionResponse() {
- return this.transactionResponse != null && !this.transactionResponse.isEmpty();
+ public boolean hasResponse() {
+ return this.response != null && !this.response.isEmpty();
}
/**
- * @param value {@link #transactionResponse} (Additional information about how this entry should be processed as part of a transaction.)
+ * @param value {@link #response} (Additional information about how this entry should be processed as part of a transaction.)
*/
- public BundleEntryComponent setTransactionResponse(BundleEntryTransactionResponseComponent value) {
- this.transactionResponse = value;
+ public BundleEntryComponent setResponse(BundleEntryResponseComponent value) {
+ this.response = value;
return this;
}
protected void listChildren(List childrenList) {
super.listChildren(childrenList);
- childrenList.add(new Property("base", "uri", "The Base URL for the resource, if different to the base URL specified for the bundle as a whole.", 0, java.lang.Integer.MAX_VALUE, base));
childrenList.add(new Property("link", "@Bundle.link", "A series of links that provide context to this entry.", 0, java.lang.Integer.MAX_VALUE, link));
+ childrenList.add(new Property("fullUrl", "uri", "The Absolute URL for the resource. This must be provided for all resources. The fullUrl SHALL not disagree with the id in the resource. The fullUrl is a version independent reference to the resource.", 0, java.lang.Integer.MAX_VALUE, fullUrl));
childrenList.add(new Property("resource", "Resource", "The Resources for the entry.", 0, java.lang.Integer.MAX_VALUE, resource));
childrenList.add(new Property("search", "", "Information about the search process that lead to the creation of this entry.", 0, java.lang.Integer.MAX_VALUE, search));
- childrenList.add(new Property("transaction", "", "Additional information about how this entry should be processed as part of a transaction.", 0, java.lang.Integer.MAX_VALUE, transaction));
- childrenList.add(new Property("transactionResponse", "", "Additional information about how this entry should be processed as part of a transaction.", 0, java.lang.Integer.MAX_VALUE, transactionResponse));
+ childrenList.add(new Property("request", "", "Additional information about how this entry should be processed as part of a transaction.", 0, java.lang.Integer.MAX_VALUE, request));
+ childrenList.add(new Property("response", "", "Additional information about how this entry should be processed as part of a transaction.", 0, java.lang.Integer.MAX_VALUE, response));
}
public BundleEntryComponent copy() {
BundleEntryComponent dst = new BundleEntryComponent();
copyValues(dst);
- dst.base = base == null ? null : base.copy();
if (link != null) {
dst.link = new ArrayList();
for (BundleLinkComponent i : link)
dst.link.add(i.copy());
};
+ dst.fullUrl = fullUrl == null ? null : fullUrl.copy();
dst.resource = resource == null ? null : resource.copy();
dst.search = search == null ? null : search.copy();
- dst.transaction = transaction == null ? null : transaction.copy();
- dst.transactionResponse = transactionResponse == null ? null : transactionResponse.copy();
+ dst.request = request == null ? null : request.copy();
+ dst.response = response == null ? null : response.copy();
return dst;
}
@@ -806,8 +834,8 @@ public class Bundle extends Resource implements IBaseBundle {
if (!(other instanceof BundleEntryComponent))
return false;
BundleEntryComponent o = (BundleEntryComponent) other;
- return compareDeep(base, o.base, true) && compareDeep(link, o.link, true) && compareDeep(resource, o.resource, true)
- && compareDeep(search, o.search, true) && compareDeep(transaction, o.transaction, true) && compareDeep(transactionResponse, o.transactionResponse, true)
+ return compareDeep(link, o.link, true) && compareDeep(fullUrl, o.fullUrl, true) && compareDeep(resource, o.resource, true)
+ && compareDeep(search, o.search, true) && compareDeep(request, o.request, true) && compareDeep(response, o.response, true)
;
}
@@ -818,13 +846,13 @@ public class Bundle extends Resource implements IBaseBundle {
if (!(other instanceof BundleEntryComponent))
return false;
BundleEntryComponent o = (BundleEntryComponent) other;
- return compareValues(base, o.base, true);
+ return compareValues(fullUrl, o.fullUrl, true);
}
public boolean isEmpty() {
- return super.isEmpty() && (base == null || base.isEmpty()) && (link == null || link.isEmpty())
- && (resource == null || resource.isEmpty()) && (search == null || search.isEmpty()) && (transaction == null || transaction.isEmpty())
- && (transactionResponse == null || transactionResponse.isEmpty());
+ return super.isEmpty() && (link == null || link.isEmpty()) && (fullUrl == null || fullUrl.isEmpty())
+ && (resource == null || resource.isEmpty()) && (search == null || search.isEmpty()) && (request == null || request.isEmpty())
+ && (response == null || response.isEmpty());
}
}
@@ -994,7 +1022,7 @@ public class Bundle extends Resource implements IBaseBundle {
}
@Block()
- public static class BundleEntryTransactionComponent extends BackboneElement implements IBaseBackboneElement {
+ public static class BundleEntryRequestComponent extends BackboneElement implements IBaseBackboneElement {
/**
* The HTTP verb for this entry in either a update history, or a transaction/ transaction response.
*/
@@ -1003,10 +1031,10 @@ public class Bundle extends Resource implements IBaseBundle {
protected Enumeration method;
/**
- * The URL for this entry, relative to the root.
+ * The URL for this entry, relative to the root (the address to which the request is posted).
*/
@Child(name = "url", type = {UriType.class}, order=2, min=1, max=1)
- @Description(shortDefinition="URL for HTTP equivalent of this entry", formalDefinition="The URL for this entry, relative to the root." )
+ @Description(shortDefinition="URL for HTTP equivalent of this entry", formalDefinition="The URL for this entry, relative to the root (the address to which the request is posted)." )
protected UriType url;
/**
@@ -1031,10 +1059,10 @@ public class Bundle extends Resource implements IBaseBundle {
protected InstantType ifModifiedSince;
/**
- * Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create".
+ * Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?").
*/
@Child(name = "ifNoneExist", type = {StringType.class}, order=6, min=0, max=1)
- @Description(shortDefinition="For conditional creates", formalDefinition="Instruct the server not to perform the create if a specified resource already exists. For further information, see 'Conditional Create'." )
+ @Description(shortDefinition="For conditional creates", formalDefinition="Instruct the server not to perform the create if a specified resource already exists. For further information, see 'Conditional Create'. This is just the query portion of the URL - what follows the '?' (not including the '?')." )
protected StringType ifNoneExist;
private static final long serialVersionUID = 1355750298L;
@@ -1042,14 +1070,14 @@ public class Bundle extends Resource implements IBaseBundle {
/*
* Constructor
*/
- public BundleEntryTransactionComponent() {
+ public BundleEntryRequestComponent() {
super();
}
/*
* Constructor
*/
- public BundleEntryTransactionComponent(Enumeration method, UriType url) {
+ public BundleEntryRequestComponent(Enumeration method, UriType url) {
super();
this.method = method;
this.url = url;
@@ -1061,7 +1089,7 @@ public class Bundle extends Resource implements IBaseBundle {
public Enumeration getMethodElement() {
if (this.method == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionComponent.method");
+ throw new Error("Attempt to auto-create BundleEntryRequestComponent.method");
else if (Configuration.doAutoCreate())
this.method = new Enumeration(new HTTPVerbEnumFactory()); // bb
return this.method;
@@ -1078,7 +1106,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value {@link #method} (The HTTP verb for this entry in either a update history, or a transaction/ transaction response.). This is the underlying object with id, value and extensions. The accessor "getMethod" gives direct access to the value
*/
- public BundleEntryTransactionComponent setMethodElement(Enumeration value) {
+ public BundleEntryRequestComponent setMethodElement(Enumeration value) {
this.method = value;
return this;
}
@@ -1093,7 +1121,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value The HTTP verb for this entry in either a update history, or a transaction/ transaction response.
*/
- public BundleEntryTransactionComponent setMethod(HTTPVerb value) {
+ public BundleEntryRequestComponent setMethod(HTTPVerb value) {
if (this.method == null)
this.method = new Enumeration(new HTTPVerbEnumFactory());
this.method.setValue(value);
@@ -1101,12 +1129,12 @@ public class Bundle extends Resource implements IBaseBundle {
}
/**
- * @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
+ * @return {@link #url} (The URL for this entry, relative to the root (the address to which the request is posted).). 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)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionComponent.url");
+ throw new Error("Attempt to auto-create BundleEntryRequestComponent.url");
else if (Configuration.doAutoCreate())
this.url = new UriType(); // bb
return this.url;
@@ -1121,24 +1149,24 @@ public class Bundle extends Resource implements IBaseBundle {
}
/**
- * @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
+ * @param value {@link #url} (The URL for this entry, relative to the root (the address to which the request is posted).). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
*/
- public BundleEntryTransactionComponent setUrlElement(UriType value) {
+ public BundleEntryRequestComponent setUrlElement(UriType value) {
this.url = value;
return this;
}
/**
- * @return The URL for this entry, relative to the root.
+ * @return The URL for this entry, relative to the root (the address to which the request is posted).
*/
public String getUrl() {
return this.url == null ? null : this.url.getValue();
}
/**
- * @param value The URL for this entry, relative to the root.
+ * @param value The URL for this entry, relative to the root (the address to which the request is posted).
*/
- public BundleEntryTransactionComponent setUrl(String value) {
+ public BundleEntryRequestComponent setUrl(String value) {
if (this.url == null)
this.url = new UriType();
this.url.setValue(value);
@@ -1151,7 +1179,7 @@ public class Bundle extends Resource implements IBaseBundle {
public StringType getIfNoneMatchElement() {
if (this.ifNoneMatch == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionComponent.ifNoneMatch");
+ throw new Error("Attempt to auto-create BundleEntryRequestComponent.ifNoneMatch");
else if (Configuration.doAutoCreate())
this.ifNoneMatch = new StringType(); // bb
return this.ifNoneMatch;
@@ -1168,7 +1196,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value {@link #ifNoneMatch} (If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation.). This is the underlying object with id, value and extensions. The accessor "getIfNoneMatch" gives direct access to the value
*/
- public BundleEntryTransactionComponent setIfNoneMatchElement(StringType value) {
+ public BundleEntryRequestComponent setIfNoneMatchElement(StringType value) {
this.ifNoneMatch = value;
return this;
}
@@ -1183,7 +1211,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value If the ETag values match, return a 304 Not modified status. See the read/vread interaction documentation.
*/
- public BundleEntryTransactionComponent setIfNoneMatch(String value) {
+ public BundleEntryRequestComponent setIfNoneMatch(String value) {
if (Utilities.noString(value))
this.ifNoneMatch = null;
else {
@@ -1200,7 +1228,7 @@ public class Bundle extends Resource implements IBaseBundle {
public StringType getIfMatchElement() {
if (this.ifMatch == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionComponent.ifMatch");
+ throw new Error("Attempt to auto-create BundleEntryRequestComponent.ifMatch");
else if (Configuration.doAutoCreate())
this.ifMatch = new StringType(); // bb
return this.ifMatch;
@@ -1217,7 +1245,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value {@link #ifMatch} (Only perform the operation if the Etag value matches. For more information, see the API section "Managing Resource Contention".). This is the underlying object with id, value and extensions. The accessor "getIfMatch" gives direct access to the value
*/
- public BundleEntryTransactionComponent setIfMatchElement(StringType value) {
+ public BundleEntryRequestComponent setIfMatchElement(StringType value) {
this.ifMatch = value;
return this;
}
@@ -1232,7 +1260,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value Only perform the operation if the Etag value matches. For more information, see the API section "Managing Resource Contention".
*/
- public BundleEntryTransactionComponent setIfMatch(String value) {
+ public BundleEntryRequestComponent setIfMatch(String value) {
if (Utilities.noString(value))
this.ifMatch = null;
else {
@@ -1249,7 +1277,7 @@ public class Bundle extends Resource implements IBaseBundle {
public InstantType getIfModifiedSinceElement() {
if (this.ifModifiedSince == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionComponent.ifModifiedSince");
+ throw new Error("Attempt to auto-create BundleEntryRequestComponent.ifModifiedSince");
else if (Configuration.doAutoCreate())
this.ifModifiedSince = new InstantType(); // bb
return this.ifModifiedSince;
@@ -1266,7 +1294,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value {@link #ifModifiedSince} (Only perform the operation if the last updated date matches. For more information, see the API section "Managing Resource Contention".). This is the underlying object with id, value and extensions. The accessor "getIfModifiedSince" gives direct access to the value
*/
- public BundleEntryTransactionComponent setIfModifiedSinceElement(InstantType value) {
+ public BundleEntryRequestComponent setIfModifiedSinceElement(InstantType value) {
this.ifModifiedSince = value;
return this;
}
@@ -1281,7 +1309,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value Only perform the operation if the last updated date matches. For more information, see the API section "Managing Resource Contention".
*/
- public BundleEntryTransactionComponent setIfModifiedSince(Date value) {
+ public BundleEntryRequestComponent setIfModifiedSince(Date value) {
if (value == null)
this.ifModifiedSince = null;
else {
@@ -1293,12 +1321,12 @@ public class Bundle extends Resource implements IBaseBundle {
}
/**
- * @return {@link #ifNoneExist} (Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create".). This is the underlying object with id, value and extensions. The accessor "getIfNoneExist" gives direct access to the value
+ * @return {@link #ifNoneExist} (Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?").). This is the underlying object with id, value and extensions. The accessor "getIfNoneExist" gives direct access to the value
*/
public StringType getIfNoneExistElement() {
if (this.ifNoneExist == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionComponent.ifNoneExist");
+ throw new Error("Attempt to auto-create BundleEntryRequestComponent.ifNoneExist");
else if (Configuration.doAutoCreate())
this.ifNoneExist = new StringType(); // bb
return this.ifNoneExist;
@@ -1313,24 +1341,24 @@ public class Bundle extends Resource implements IBaseBundle {
}
/**
- * @param value {@link #ifNoneExist} (Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create".). This is the underlying object with id, value and extensions. The accessor "getIfNoneExist" gives direct access to the value
+ * @param value {@link #ifNoneExist} (Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?").). This is the underlying object with id, value and extensions. The accessor "getIfNoneExist" gives direct access to the value
*/
- public BundleEntryTransactionComponent setIfNoneExistElement(StringType value) {
+ public BundleEntryRequestComponent setIfNoneExistElement(StringType value) {
this.ifNoneExist = value;
return this;
}
/**
- * @return Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create".
+ * @return Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?").
*/
public String getIfNoneExist() {
return this.ifNoneExist == null ? null : this.ifNoneExist.getValue();
}
/**
- * @param value Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create".
+ * @param value Instruct the server not to perform the create if a specified resource already exists. For further information, see "Conditional Create". This is just the query portion of the URL - what follows the "?" (not including the "?").
*/
- public BundleEntryTransactionComponent setIfNoneExist(String value) {
+ public BundleEntryRequestComponent setIfNoneExist(String value) {
if (Utilities.noString(value))
this.ifNoneExist = null;
else {
@@ -1344,15 +1372,15 @@ public class Bundle extends Resource implements IBaseBundle {
protected void listChildren(List 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", "The URL for this entry, relative to the root.", 0, java.lang.Integer.MAX_VALUE, url));
+ childrenList.add(new Property("url", "uri", "The URL for this entry, relative to the root (the address to which the request is posted).", 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));
- childrenList.add(new Property("ifNoneExist", "string", "Instruct the server not to perform the create if a specified resource already exists. For further information, see 'Conditional Create'.", 0, java.lang.Integer.MAX_VALUE, ifNoneExist));
+ childrenList.add(new Property("ifNoneExist", "string", "Instruct the server not to perform the create if a specified resource already exists. For further information, see 'Conditional Create'. This is just the query portion of the URL - what follows the '?' (not including the '?').", 0, java.lang.Integer.MAX_VALUE, ifNoneExist));
}
- public BundleEntryTransactionComponent copy() {
- BundleEntryTransactionComponent dst = new BundleEntryTransactionComponent();
+ public BundleEntryRequestComponent copy() {
+ BundleEntryRequestComponent dst = new BundleEntryRequestComponent();
copyValues(dst);
dst.method = method == null ? null : method.copy();
dst.url = url == null ? null : url.copy();
@@ -1367,9 +1395,9 @@ public class Bundle extends Resource implements IBaseBundle {
public boolean equalsDeep(Base other) {
if (!super.equalsDeep(other))
return false;
- if (!(other instanceof BundleEntryTransactionComponent))
+ if (!(other instanceof BundleEntryRequestComponent))
return false;
- BundleEntryTransactionComponent o = (BundleEntryTransactionComponent) other;
+ BundleEntryRequestComponent o = (BundleEntryRequestComponent) other;
return compareDeep(method, o.method, true) && compareDeep(url, o.url, true) && compareDeep(ifNoneMatch, o.ifNoneMatch, true)
&& compareDeep(ifMatch, o.ifMatch, true) && compareDeep(ifModifiedSince, o.ifModifiedSince, true)
&& compareDeep(ifNoneExist, o.ifNoneExist, true);
@@ -1379,9 +1407,9 @@ public class Bundle extends Resource implements IBaseBundle {
public boolean equalsShallow(Base other) {
if (!super.equalsShallow(other))
return false;
- if (!(other instanceof BundleEntryTransactionComponent))
+ if (!(other instanceof BundleEntryRequestComponent))
return false;
- BundleEntryTransactionComponent o = (BundleEntryTransactionComponent) other;
+ BundleEntryRequestComponent o = (BundleEntryRequestComponent) other;
return compareValues(method, o.method, true) && compareValues(url, o.url, true) && compareValues(ifNoneMatch, o.ifNoneMatch, true)
&& compareValues(ifMatch, o.ifMatch, true) && compareValues(ifModifiedSince, o.ifModifiedSince, true)
&& compareValues(ifNoneExist, o.ifNoneExist, true);
@@ -1397,7 +1425,7 @@ public class Bundle extends Resource implements IBaseBundle {
}
@Block()
- public static class BundleEntryTransactionResponseComponent extends BackboneElement implements IBaseBackboneElement {
+ public static class BundleEntryResponseComponent extends BackboneElement implements IBaseBackboneElement {
/**
* The status code returned by processing this entry.
*/
@@ -1431,14 +1459,14 @@ public class Bundle extends Resource implements IBaseBundle {
/*
* Constructor
*/
- public BundleEntryTransactionResponseComponent() {
+ public BundleEntryResponseComponent() {
super();
}
/*
* Constructor
*/
- public BundleEntryTransactionResponseComponent(StringType status) {
+ public BundleEntryResponseComponent(StringType status) {
super();
this.status = status;
}
@@ -1449,7 +1477,7 @@ public class Bundle extends Resource implements IBaseBundle {
public StringType getStatusElement() {
if (this.status == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionResponseComponent.status");
+ throw new Error("Attempt to auto-create BundleEntryResponseComponent.status");
else if (Configuration.doAutoCreate())
this.status = new StringType(); // bb
return this.status;
@@ -1466,7 +1494,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value {@link #status} (The status code returned by processing this entry.). This is the underlying object with id, value and extensions. The accessor "getStatus" gives direct access to the value
*/
- public BundleEntryTransactionResponseComponent setStatusElement(StringType value) {
+ public BundleEntryResponseComponent setStatusElement(StringType value) {
this.status = value;
return this;
}
@@ -1481,7 +1509,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value The status code returned by processing this entry.
*/
- public BundleEntryTransactionResponseComponent setStatus(String value) {
+ public BundleEntryResponseComponent setStatus(String value) {
if (this.status == null)
this.status = new StringType();
this.status.setValue(value);
@@ -1494,7 +1522,7 @@ public class Bundle extends Resource implements IBaseBundle {
public UriType getLocationElement() {
if (this.location == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionResponseComponent.location");
+ throw new Error("Attempt to auto-create BundleEntryResponseComponent.location");
else if (Configuration.doAutoCreate())
this.location = new UriType(); // bb
return this.location;
@@ -1511,7 +1539,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value {@link #location} (The location header created by processing this operation.). This is the underlying object with id, value and extensions. The accessor "getLocation" gives direct access to the value
*/
- public BundleEntryTransactionResponseComponent setLocationElement(UriType value) {
+ public BundleEntryResponseComponent setLocationElement(UriType value) {
this.location = value;
return this;
}
@@ -1526,7 +1554,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value The location header created by processing this operation.
*/
- public BundleEntryTransactionResponseComponent setLocation(String value) {
+ public BundleEntryResponseComponent setLocation(String value) {
if (Utilities.noString(value))
this.location = null;
else {
@@ -1543,7 +1571,7 @@ public class Bundle extends Resource implements IBaseBundle {
public StringType getEtagElement() {
if (this.etag == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionResponseComponent.etag");
+ throw new Error("Attempt to auto-create BundleEntryResponseComponent.etag");
else if (Configuration.doAutoCreate())
this.etag = new StringType(); // bb
return this.etag;
@@ -1560,7 +1588,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value {@link #etag} (The etag for the resource, it the operation for the entry produced a versioned resource.). This is the underlying object with id, value and extensions. The accessor "getEtag" gives direct access to the value
*/
- public BundleEntryTransactionResponseComponent setEtagElement(StringType value) {
+ public BundleEntryResponseComponent setEtagElement(StringType value) {
this.etag = value;
return this;
}
@@ -1575,7 +1603,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value The etag for the resource, it the operation for the entry produced a versioned resource.
*/
- public BundleEntryTransactionResponseComponent setEtag(String value) {
+ public BundleEntryResponseComponent setEtag(String value) {
if (Utilities.noString(value))
this.etag = null;
else {
@@ -1592,7 +1620,7 @@ public class Bundle extends Resource implements IBaseBundle {
public InstantType getLastModifiedElement() {
if (this.lastModified == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create BundleEntryTransactionResponseComponent.lastModified");
+ throw new Error("Attempt to auto-create BundleEntryResponseComponent.lastModified");
else if (Configuration.doAutoCreate())
this.lastModified = new InstantType(); // bb
return this.lastModified;
@@ -1609,7 +1637,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value {@link #lastModified} (The date/time that the resource was modified on the server.). This is the underlying object with id, value and extensions. The accessor "getLastModified" gives direct access to the value
*/
- public BundleEntryTransactionResponseComponent setLastModifiedElement(InstantType value) {
+ public BundleEntryResponseComponent setLastModifiedElement(InstantType value) {
this.lastModified = value;
return this;
}
@@ -1624,7 +1652,7 @@ public class Bundle extends Resource implements IBaseBundle {
/**
* @param value The date/time that the resource was modified on the server.
*/
- public BundleEntryTransactionResponseComponent setLastModified(Date value) {
+ public BundleEntryResponseComponent setLastModified(Date value) {
if (value == null)
this.lastModified = null;
else {
@@ -1643,8 +1671,8 @@ public class Bundle extends Resource implements IBaseBundle {
childrenList.add(new Property("lastModified", "instant", "The date/time that the resource was modified on the server.", 0, java.lang.Integer.MAX_VALUE, lastModified));
}
- public BundleEntryTransactionResponseComponent copy() {
- BundleEntryTransactionResponseComponent dst = new BundleEntryTransactionResponseComponent();
+ public BundleEntryResponseComponent copy() {
+ BundleEntryResponseComponent dst = new BundleEntryResponseComponent();
copyValues(dst);
dst.status = status == null ? null : status.copy();
dst.location = location == null ? null : location.copy();
@@ -1657,9 +1685,9 @@ public class Bundle extends Resource implements IBaseBundle {
public boolean equalsDeep(Base other) {
if (!super.equalsDeep(other))
return false;
- if (!(other instanceof BundleEntryTransactionResponseComponent))
+ if (!(other instanceof BundleEntryResponseComponent))
return false;
- BundleEntryTransactionResponseComponent o = (BundleEntryTransactionResponseComponent) other;
+ BundleEntryResponseComponent o = (BundleEntryResponseComponent) other;
return compareDeep(status, o.status, true) && compareDeep(location, o.location, true) && compareDeep(etag, o.etag, true)
&& compareDeep(lastModified, o.lastModified, true);
}
@@ -1668,9 +1696,9 @@ public class Bundle extends Resource implements IBaseBundle {
public boolean equalsShallow(Base other) {
if (!super.equalsShallow(other))
return false;
- if (!(other instanceof BundleEntryTransactionResponseComponent))
+ if (!(other instanceof BundleEntryResponseComponent))
return false;
- BundleEntryTransactionResponseComponent o = (BundleEntryTransactionResponseComponent) other;
+ BundleEntryResponseComponent o = (BundleEntryResponseComponent) other;
return compareValues(status, o.status, true) && compareValues(location, o.location, true) && compareValues(etag, o.etag, true)
&& compareValues(lastModified, o.lastModified, true);
}
@@ -1686,45 +1714,38 @@ public class Bundle extends Resource implements IBaseBundle {
* Indicates the purpose of this bundle- how it was intended to be used.
*/
@Child(name = "type", type = {CodeType.class}, order=0, min=1, max=1)
- @Description(shortDefinition="document | message | transaction | transaction-response | history | searchset | collection", formalDefinition="Indicates the purpose of this bundle- how it was intended to be used." )
+ @Description(shortDefinition="document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection", formalDefinition="Indicates the purpose of this bundle- how it was intended to be used." )
protected Enumeration type;
- /**
- * The base URL for the service that provided these resources. All relative URLs are relative to this one (equivalent to xml:base).
- */
- @Child(name = "base", type = {UriType.class}, order=1, min=0, max=1)
- @Description(shortDefinition="Stated Base URL", formalDefinition="The base URL for the service that provided these resources. All relative URLs are relative to this one (equivalent to xml:base)." )
- protected UriType base;
-
/**
* If a set of search matches, this is the total number of matches for the search (as opposed to the number of results in this bundle).
*/
- @Child(name = "total", type = {UnsignedIntType.class}, order=2, min=0, max=1)
+ @Child(name = "total", type = {UnsignedIntType.class}, order=1, min=0, max=1)
@Description(shortDefinition="If search, the total number of matches", formalDefinition="If a set of search matches, this is the total number of matches for the search (as opposed to the number of results in this bundle)." )
protected UnsignedIntType total;
/**
* A series of links that provide context to this bundle.
*/
- @Child(name = "link", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED)
+ @Child(name = "link", type = {}, order=2, min=0, max=Child.MAX_UNLIMITED)
@Description(shortDefinition="Links related to this Bundle", formalDefinition="A series of links that provide context to this bundle." )
protected List link;
/**
* An entry in a bundle resource - will either contain a resource, or information about a resource (transactions and history only).
*/
- @Child(name = "entry", type = {}, order=4, min=0, max=Child.MAX_UNLIMITED)
+ @Child(name = "entry", type = {}, order=3, min=0, max=Child.MAX_UNLIMITED)
@Description(shortDefinition="Entry in the bundle - will have a resource, or information", formalDefinition="An entry in a bundle resource - will either contain a resource, or information about a resource (transactions and history only)." )
protected List entry;
/**
- * XML Digital Signature - base64 encoded.
+ * Digital Signature - base64 encoded. XML DigSIg or a JWT.
*/
- @Child(name = "signature", type = {Base64BinaryType.class}, order=5, min=0, max=1)
- @Description(shortDefinition="XML Digital Signature (base64 encoded)", formalDefinition="XML Digital Signature - base64 encoded." )
- protected Base64BinaryType signature;
+ @Child(name = "signature", type = {Signature.class}, order=4, min=0, max=1)
+ @Description(shortDefinition="Digital Signature", formalDefinition="Digital Signature - base64 encoded. XML DigSIg or a JWT." )
+ protected Signature signature;
- private static final long serialVersionUID = -1380125450L;
+ private static final long serialVersionUID = -2041954721L;
/*
* Constructor
@@ -1786,55 +1807,6 @@ public class Bundle extends Resource implements IBaseBundle {
return this;
}
- /**
- * @return {@link #base} (The base URL for the service that provided these resources. All relative URLs are relative to this one (equivalent to xml:base).). This is the underlying object with id, value and extensions. The accessor "getBase" gives direct access to the value
- */
- public UriType getBaseElement() {
- if (this.base == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create Bundle.base");
- else if (Configuration.doAutoCreate())
- this.base = new UriType(); // bb
- return this.base;
- }
-
- public boolean hasBaseElement() {
- return this.base != null && !this.base.isEmpty();
- }
-
- public boolean hasBase() {
- return this.base != null && !this.base.isEmpty();
- }
-
- /**
- * @param value {@link #base} (The base URL for the service that provided these resources. All relative URLs are relative to this one (equivalent to xml:base).). This is the underlying object with id, value and extensions. The accessor "getBase" gives direct access to the value
- */
- public Bundle setBaseElement(UriType value) {
- this.base = value;
- return this;
- }
-
- /**
- * @return The base URL for the service that provided these resources. All relative URLs are relative to this one (equivalent to xml:base).
- */
- public String getBase() {
- return this.base == null ? null : this.base.getValue();
- }
-
- /**
- * @param value The base URL for the service that provided these resources. All relative URLs are relative to this one (equivalent to xml:base).
- */
- public Bundle setBase(String value) {
- if (Utilities.noString(value))
- this.base = null;
- else {
- if (this.base == null)
- this.base = new UriType();
- this.base.setValue(value);
- }
- return this;
- }
-
/**
* @return {@link #total} (If a set of search matches, this is the total number of matches for the search (as opposed to the number of results in this bundle).). This is the underlying object with id, value and extensions. The accessor "getTotal" gives direct access to the value
*/
@@ -1961,54 +1933,29 @@ public class Bundle extends Resource implements IBaseBundle {
}
/**
- * @return {@link #signature} (XML Digital Signature - base64 encoded.). This is the underlying object with id, value and extensions. The accessor "getSignature" gives direct access to the value
+ * @return {@link #signature} (Digital Signature - base64 encoded. XML DigSIg or a JWT.)
*/
- public Base64BinaryType getSignatureElement() {
+ public Signature getSignature() {
if (this.signature == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create Bundle.signature");
else if (Configuration.doAutoCreate())
- this.signature = new Base64BinaryType(); // bb
+ this.signature = new Signature(); // cc
return this.signature;
}
- public boolean hasSignatureElement() {
- return this.signature != null && !this.signature.isEmpty();
- }
-
public boolean hasSignature() {
return this.signature != null && !this.signature.isEmpty();
}
/**
- * @param value {@link #signature} (XML Digital Signature - base64 encoded.). This is the underlying object with id, value and extensions. The accessor "getSignature" gives direct access to the value
+ * @param value {@link #signature} (Digital Signature - base64 encoded. XML DigSIg or a JWT.)
*/
- public Bundle setSignatureElement(Base64BinaryType value) {
+ public Bundle setSignature(Signature value) {
this.signature = value;
return this;
}
- /**
- * @return XML Digital Signature - base64 encoded.
- */
- public byte[] getSignature() {
- return this.signature == null ? null : this.signature.getValue();
- }
-
- /**
- * @param value XML Digital Signature - base64 encoded.
- */
- public Bundle setSignature(byte[] value) {
- if (value == null)
- this.signature = null;
- else {
- if (this.signature == null)
- this.signature = new Base64BinaryType();
- this.signature.setValue(value);
- }
- return this;
- }
-
/**
* Returns the {@link #getLink() link} which matches a given {@link BundleLinkComponent#getRelation() relation}.
* If no link is found which matches the given relation, returns null. If more than one
@@ -2059,18 +2006,16 @@ public class Bundle extends Resource implements IBaseBundle {
protected void listChildren(List childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("type", "code", "Indicates the purpose of this bundle- how it was intended to be used.", 0, java.lang.Integer.MAX_VALUE, type));
- childrenList.add(new Property("base", "uri", "The base URL for the service that provided these resources. All relative URLs are relative to this one (equivalent to xml:base).", 0, java.lang.Integer.MAX_VALUE, base));
childrenList.add(new Property("total", "unsignedInt", "If a set of search matches, this is the total number of matches for the search (as opposed to the number of results in this bundle).", 0, java.lang.Integer.MAX_VALUE, total));
childrenList.add(new Property("link", "", "A series of links that provide context to this bundle.", 0, java.lang.Integer.MAX_VALUE, link));
childrenList.add(new Property("entry", "", "An entry in a bundle resource - will either contain a resource, or information about a resource (transactions and history only).", 0, java.lang.Integer.MAX_VALUE, entry));
- childrenList.add(new Property("signature", "base64Binary", "XML Digital Signature - base64 encoded.", 0, java.lang.Integer.MAX_VALUE, signature));
+ childrenList.add(new Property("signature", "Signature", "Digital Signature - base64 encoded. XML DigSIg or a JWT.", 0, java.lang.Integer.MAX_VALUE, signature));
}
public Bundle copy() {
Bundle dst = new Bundle();
copyValues(dst);
dst.type = type == null ? null : type.copy();
- dst.base = base == null ? null : base.copy();
dst.total = total == null ? null : total.copy();
if (link != null) {
dst.link = new ArrayList();
@@ -2097,9 +2042,8 @@ public class Bundle extends Resource implements IBaseBundle {
if (!(other instanceof Bundle))
return false;
Bundle o = (Bundle) other;
- return compareDeep(type, o.type, true) && compareDeep(base, o.base, true) && compareDeep(total, o.total, true)
- && compareDeep(link, o.link, true) && compareDeep(entry, o.entry, true) && compareDeep(signature, o.signature, true)
- ;
+ return compareDeep(type, o.type, true) && compareDeep(total, o.total, true) && compareDeep(link, o.link, true)
+ && compareDeep(entry, o.entry, true) && compareDeep(signature, o.signature, true);
}
@Override
@@ -2109,14 +2053,13 @@ public class Bundle extends Resource implements IBaseBundle {
if (!(other instanceof Bundle))
return false;
Bundle o = (Bundle) other;
- return compareValues(type, o.type, true) && compareValues(base, o.base, true) && compareValues(total, o.total, true)
- && compareValues(signature, o.signature, true);
+ return compareValues(type, o.type, true) && compareValues(total, o.total, true);
}
public boolean isEmpty() {
- return super.isEmpty() && (type == null || type.isEmpty()) && (base == null || base.isEmpty())
- && (total == null || total.isEmpty()) && (link == null || link.isEmpty()) && (entry == null || entry.isEmpty())
- && (signature == null || signature.isEmpty());
+ return super.isEmpty() && (type == null || type.isEmpty()) && (total == null || total.isEmpty())
+ && (link == null || link.isEmpty()) && (entry == null || entry.isEmpty()) && (signature == null || signature.isEmpty())
+ ;
}
@Override
@@ -2126,7 +2069,7 @@ public class Bundle extends Resource implements IBaseBundle {
@SearchParamDefinition(name="composition", path="", description="The first resource in the bundle, if the bundle type is 'document' - this is a composition, and this parameter provides access to searches its contents", type="reference" )
public static final String SP_COMPOSITION = "composition";
- @SearchParamDefinition(name="type", path="Bundle.type", description="document | message | transaction | transaction-response | history | searchset | collection", type="token" )
+ @SearchParamDefinition(name="type", path="Bundle.type", description="document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection", type="token" )
public static final String SP_TYPE = "type";
@SearchParamDefinition(name="message", path="", description="The first resource in the bundle, if the bundle type is 'message' - this is a message header, and this parameter provides access to search its contents", type="reference" )
public static final String SP_MESSAGE = "message";
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java
index cc3238a9de1..9b4a7633f9e 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java
index db0a4de6782..9463e498ade 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java
index b4eeb6d922a..98bb51b1467 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java
index 31357a19adf..0d2b8bbe08a 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java
index dee9561853e..01b0343f1b0 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java
index e30f231f65c..fc451ed0682 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java
index 28a4a014456..b7fdbf1d5ed 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java
index 6e7e293e1d8..4402c8afec7 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java
index 7937005fead..e78cea43c2d 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java
index 42067abc17d..a35a08584c3 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java
index 962cb989d50..a585c8ae88f 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java
index 0fa8ad3cea7..46888e5c403 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -461,6 +461,106 @@ public class Conformance extends DomainResource implements IBaseConformance {
}
}
+ public enum TransactionMode {
+ /**
+ * Neither Batch or Transaction supported
+ */
+ NOTSUPPORTED,
+ /**
+ * Batches supported
+ */
+ BATCH,
+ /**
+ * Transactions Supported
+ */
+ TRANSACTION,
+ /**
+ * Both Batches and Transactions Supported
+ */
+ BOTH,
+ /**
+ * added to help the parsers
+ */
+ NULL;
+ public static TransactionMode fromCode(String codeString) throws Exception {
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("not-supported".equals(codeString))
+ return NOTSUPPORTED;
+ if ("batch".equals(codeString))
+ return BATCH;
+ if ("transaction".equals(codeString))
+ return TRANSACTION;
+ if ("both".equals(codeString))
+ return BOTH;
+ throw new Exception("Unknown TransactionMode code '"+codeString+"'");
+ }
+ public String toCode() {
+ switch (this) {
+ case NOTSUPPORTED: return "not-supported";
+ case BATCH: return "batch";
+ case TRANSACTION: return "transaction";
+ case BOTH: return "both";
+ default: return "?";
+ }
+ }
+ public String getSystem() {
+ switch (this) {
+ case NOTSUPPORTED: return "http://hl7.org/fhir/transaction-mode";
+ case BATCH: return "http://hl7.org/fhir/transaction-mode";
+ case TRANSACTION: return "http://hl7.org/fhir/transaction-mode";
+ case BOTH: return "http://hl7.org/fhir/transaction-mode";
+ default: return "?";
+ }
+ }
+ public String getDefinition() {
+ switch (this) {
+ case NOTSUPPORTED: return "Neither Batch or Transaction supported";
+ case BATCH: return "Batches supported";
+ case TRANSACTION: return "Transactions Supported";
+ case BOTH: return "Both Batches and Transactions Supported";
+ default: return "?";
+ }
+ }
+ public String getDisplay() {
+ switch (this) {
+ case NOTSUPPORTED: return "None";
+ case BATCH: return "Batches supported";
+ case TRANSACTION: return "Transactions Supported";
+ case BOTH: return "Batches & Transactions";
+ default: return "?";
+ }
+ }
+ }
+
+ public static class TransactionModeEnumFactory implements EnumFactory {
+ public TransactionMode fromCode(String codeString) throws IllegalArgumentException {
+ if (codeString == null || "".equals(codeString))
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("not-supported".equals(codeString))
+ return TransactionMode.NOTSUPPORTED;
+ if ("batch".equals(codeString))
+ return TransactionMode.BATCH;
+ if ("transaction".equals(codeString))
+ return TransactionMode.TRANSACTION;
+ if ("both".equals(codeString))
+ return TransactionMode.BOTH;
+ throw new IllegalArgumentException("Unknown TransactionMode code '"+codeString+"'");
+ }
+ public String toCode(TransactionMode code) {
+ if (code == TransactionMode.NOTSUPPORTED)
+ return "not-supported";
+ if (code == TransactionMode.BATCH)
+ return "batch";
+ if (code == TransactionMode.TRANSACTION)
+ return "transaction";
+ if (code == TransactionMode.BOTH)
+ return "both";
+ return "?";
+ }
+ }
+
public enum MessageSignificanceCategory {
/**
* The message represents/requests a change that should not be processed more than once. E.g. Making a booking for an appointment
@@ -1283,28 +1383,35 @@ public class Conformance extends DomainResource implements IBaseConformance {
@Description(shortDefinition="What operations are supported?", formalDefinition="A specification of restful operations supported by the system." )
protected List interaction;
+ /**
+ * A code that indicates how transactions are supported.
+ */
+ @Child(name = "transactionMode", type = {CodeType.class}, order=6, min=0, max=1)
+ @Description(shortDefinition="not-supported | batch | transaction | both", formalDefinition="A code that indicates how transactions are supported." )
+ protected Enumeration transactionMode;
+
/**
* Definition of an operation or a named query and with its parameters and their meaning and type.
*/
- @Child(name = "operation", type = {}, order=6, min=0, max=Child.MAX_UNLIMITED)
+ @Child(name = "operation", type = {}, order=7, min=0, max=Child.MAX_UNLIMITED)
@Description(shortDefinition="Definition of an operation or a custom query", formalDefinition="Definition of an operation or a named query and with its parameters and their meaning and type." )
protected List operation;
/**
* A list of absolute URIs that identify profiles that this server implements for accepting documents in the mailbox. If this list is empty, then documents are not accepted. The base specification has the profile identifier "http://hl7.org/fhir/documents/mailbox". Other specifications can declare their own identifier for this purpose.
*/
- @Child(name = "documentMailbox", type = {UriType.class}, order=7, min=0, max=Child.MAX_UNLIMITED)
+ @Child(name = "documentMailbox", type = {UriType.class}, order=8, min=0, max=Child.MAX_UNLIMITED)
@Description(shortDefinition="How documents are accepted in /Mailbox", formalDefinition="A list of absolute URIs that identify profiles that this server implements for accepting documents in the mailbox. If this list is empty, then documents are not accepted. The base specification has the profile identifier 'http://hl7.org/fhir/documents/mailbox'. Other specifications can declare their own identifier for this purpose." )
protected List documentMailbox;
/**
* An absolute URI which is a reference to the definition of a compartment hosted by the system.
*/
- @Child(name = "compartment", type = {UriType.class}, order=8, min=0, max=Child.MAX_UNLIMITED)
+ @Child(name = "compartment", type = {UriType.class}, order=9, min=0, max=Child.MAX_UNLIMITED)
@Description(shortDefinition="Compartments served/used by system", formalDefinition="An absolute URI which is a reference to the definition of a compartment hosted by the system." )
protected List compartment;
- private static final long serialVersionUID = -535980615L;
+ private static final long serialVersionUID = 471286912L;
/*
* Constructor
@@ -1519,6 +1626,55 @@ public class Conformance extends DomainResource implements IBaseConformance {
return this;
}
+ /**
+ * @return {@link #transactionMode} (A code that indicates how transactions are supported.). This is the underlying object with id, value and extensions. The accessor "getTransactionMode" gives direct access to the value
+ */
+ public Enumeration getTransactionModeElement() {
+ if (this.transactionMode == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create ConformanceRestComponent.transactionMode");
+ else if (Configuration.doAutoCreate())
+ this.transactionMode = new Enumeration(new TransactionModeEnumFactory()); // bb
+ return this.transactionMode;
+ }
+
+ public boolean hasTransactionModeElement() {
+ return this.transactionMode != null && !this.transactionMode.isEmpty();
+ }
+
+ public boolean hasTransactionMode() {
+ return this.transactionMode != null && !this.transactionMode.isEmpty();
+ }
+
+ /**
+ * @param value {@link #transactionMode} (A code that indicates how transactions are supported.). This is the underlying object with id, value and extensions. The accessor "getTransactionMode" gives direct access to the value
+ */
+ public ConformanceRestComponent setTransactionModeElement(Enumeration value) {
+ this.transactionMode = value;
+ return this;
+ }
+
+ /**
+ * @return A code that indicates how transactions are supported.
+ */
+ public TransactionMode getTransactionMode() {
+ return this.transactionMode == null ? null : this.transactionMode.getValue();
+ }
+
+ /**
+ * @param value A code that indicates how transactions are supported.
+ */
+ public ConformanceRestComponent setTransactionMode(TransactionMode value) {
+ if (value == null)
+ this.transactionMode = null;
+ else {
+ if (this.transactionMode == null)
+ this.transactionMode = new Enumeration(new TransactionModeEnumFactory());
+ this.transactionMode.setValue(value);
+ }
+ return this;
+ }
+
/**
* @return {@link #operation} (Definition of an operation or a named query and with its parameters and their meaning and type.)
*/
@@ -1674,6 +1830,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
childrenList.add(new Property("security", "", "Information about security implementation from an interface perspective - what a client needs to know.", 0, java.lang.Integer.MAX_VALUE, security));
childrenList.add(new Property("resource", "", "A specification of the restful capabilities of the solution for a specific resource type.", 0, java.lang.Integer.MAX_VALUE, resource));
childrenList.add(new Property("interaction", "", "A specification of restful operations supported by the system.", 0, java.lang.Integer.MAX_VALUE, interaction));
+ childrenList.add(new Property("transactionMode", "code", "A code that indicates how transactions are supported.", 0, java.lang.Integer.MAX_VALUE, transactionMode));
childrenList.add(new Property("operation", "", "Definition of an operation or a named query and with its parameters and their meaning and type.", 0, java.lang.Integer.MAX_VALUE, operation));
childrenList.add(new Property("documentMailbox", "uri", "A list of absolute URIs that identify profiles that this server implements for accepting documents in the mailbox. If this list is empty, then documents are not accepted. The base specification has the profile identifier 'http://hl7.org/fhir/documents/mailbox'. Other specifications can declare their own identifier for this purpose.", 0, java.lang.Integer.MAX_VALUE, documentMailbox));
childrenList.add(new Property("compartment", "uri", "An absolute URI which is a reference to the definition of a compartment hosted by the system.", 0, java.lang.Integer.MAX_VALUE, compartment));
@@ -1695,6 +1852,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
for (SystemInteractionComponent i : interaction)
dst.interaction.add(i.copy());
};
+ dst.transactionMode = transactionMode == null ? null : transactionMode.copy();
if (operation != null) {
dst.operation = new ArrayList();
for (ConformanceRestOperationComponent i : operation)
@@ -1721,9 +1879,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
return false;
ConformanceRestComponent o = (ConformanceRestComponent) other;
return compareDeep(mode, o.mode, true) && compareDeep(documentation, o.documentation, true) && compareDeep(security, o.security, true)
- && compareDeep(resource, o.resource, true) && compareDeep(interaction, o.interaction, true) && compareDeep(operation, o.operation, true)
- && compareDeep(documentMailbox, o.documentMailbox, true) && compareDeep(compartment, o.compartment, true)
- ;
+ && compareDeep(resource, o.resource, true) && compareDeep(interaction, o.interaction, true) && compareDeep(transactionMode, o.transactionMode, true)
+ && compareDeep(operation, o.operation, true) && compareDeep(documentMailbox, o.documentMailbox, true)
+ && compareDeep(compartment, o.compartment, true);
}
@Override
@@ -1733,15 +1891,17 @@ public class Conformance extends DomainResource implements IBaseConformance {
if (!(other instanceof ConformanceRestComponent))
return false;
ConformanceRestComponent o = (ConformanceRestComponent) other;
- return compareValues(mode, o.mode, true) && compareValues(documentation, o.documentation, true) && compareValues(documentMailbox, o.documentMailbox, true)
- && compareValues(compartment, o.compartment, true);
+ return compareValues(mode, o.mode, true) && compareValues(documentation, o.documentation, true) && compareValues(transactionMode, o.transactionMode, true)
+ && compareValues(documentMailbox, o.documentMailbox, true) && compareValues(compartment, o.compartment, true)
+ ;
}
public boolean isEmpty() {
return super.isEmpty() && (mode == null || mode.isEmpty()) && (documentation == null || documentation.isEmpty())
&& (security == null || security.isEmpty()) && (resource == null || resource.isEmpty()) && (interaction == null || interaction.isEmpty())
- && (operation == null || operation.isEmpty()) && (documentMailbox == null || documentMailbox.isEmpty())
- && (compartment == null || compartment.isEmpty());
+ && (transactionMode == null || transactionMode.isEmpty()) && (operation == null || operation.isEmpty())
+ && (documentMailbox == null || documentMailbox.isEmpty()) && (compartment == null || compartment.isEmpty())
+ ;
}
}
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java
index fb9d2dc7cfb..edb8cda5a11 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 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 = "5780";
- public final static String DATE = "Wed Jul 08 17:35:37 EDT 2015";
+ public final static String REVISION = "5843";
+ public final static String DATE = "Tue Jul 14 17:35:58 EDT 2015";
}
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java
index 70e806ee862..7b546042b43 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java
index 7283cfc5cd2..5f403d8bf87 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java
index 621072d24d6..869f1b74ed5 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java
index 9c3dedcd828..20c3e0eea97 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 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;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java
index d03c4252a21..17b515ea755 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java
index de31d5851a4..f9ae1652d55 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java
index 08abbe9dd9c..3688a03f70e 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java
index e76d19e1bce..0ac46a038be 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java
index 253fd1ae430..4de04be2083 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java
index 7e476704ad1..e70a45479fb 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java
index ad6766525fe..84bcf15ffc0 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java
index 468bc8fe18f..bde601bc4b3 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java
index 0dd033a1217..00826ff6092 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java
index e17df5ea0b1..cb144342e49 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 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;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java
index 6e1fcaa0340..e0a0c0ffb45 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java
index 1f7f27995b0..4fb9e301e91 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java
index 81b12b98330..82b822ee121 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java
index 6cb121084b5..12dd739cc2a 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 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;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java
index b1443582d38..0d0f5eb5eb3 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java
index 96bbd717310..177ee2ccfef 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -1223,35 +1223,28 @@ public class ElementDefinition extends Type implements ICompositeType {
@Block()
public static class ElementDefinitionBindingComponent extends Element implements IBaseDatatypeElement {
- /**
- * A descriptive name for this - can be useful for generating implementation artifacts.
- */
- @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;
-
/**
* 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 = "strength", type = {CodeType.class}, order=2, min=1, max=1)
+ @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 strength;
/**
* Describes the intended use of this particular set of codes.
*/
- @Child(name = "description", type = {StringType.class}, order=3, min=0, max=1)
+ @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1)
@Description(shortDefinition="Human explanation of the value set", formalDefinition="Describes the intended use of this particular set of codes." )
protected StringType description;
/**
* Points to the value set or external definition (e.g. implicit value set) that identifies the set of codes to be used.
*/
- @Child(name = "valueSet", type = {UriType.class, ValueSet.class}, order=4, min=0, max=1)
+ @Child(name = "valueSet", type = {UriType.class, ValueSet.class}, order=3, min=0, 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;
- private static final long serialVersionUID = 325485202L;
+ private static final long serialVersionUID = 1355538460L;
/*
* Constructor
@@ -1268,55 +1261,6 @@ public class ElementDefinition extends Type implements ICompositeType {
this.strength = strength;
}
- /**
- * @return {@link #name} (A descriptive name for this - can be useful for generating implementation artifacts.). 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 ElementDefinitionBindingComponent.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} (A descriptive name for this - can be useful for generating implementation artifacts.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
- */
- public ElementDefinitionBindingComponent setNameElement(StringType value) {
- this.name = value;
- return this;
- }
-
- /**
- * @return A descriptive name for this - can be useful for generating implementation artifacts.
- */
- public String getName() {
- return this.name == null ? null : this.name.getValue();
- }
-
- /**
- * @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;
- }
-
/**
* @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
*/
@@ -1458,7 +1402,6 @@ public class ElementDefinition extends Type implements ICompositeType {
protected void listChildren(List childrenList) {
super.listChildren(childrenList);
- childrenList.add(new Property("name", "string", "A descriptive name for this - can be useful for generating implementation artifacts.", 0, java.lang.Integer.MAX_VALUE, name));
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("description", "string", "Describes the intended use of this particular set of codes.", 0, java.lang.Integer.MAX_VALUE, description));
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));
@@ -1467,7 +1410,6 @@ public class ElementDefinition extends Type implements ICompositeType {
public ElementDefinitionBindingComponent copy() {
ElementDefinitionBindingComponent dst = new ElementDefinitionBindingComponent();
copyValues(dst);
- dst.name = name == null ? null : name.copy();
dst.strength = strength == null ? null : strength.copy();
dst.description = description == null ? null : description.copy();
dst.valueSet = valueSet == null ? null : valueSet.copy();
@@ -1481,7 +1423,7 @@ public class ElementDefinition extends Type implements ICompositeType {
if (!(other instanceof ElementDefinitionBindingComponent))
return false;
ElementDefinitionBindingComponent o = (ElementDefinitionBindingComponent) other;
- return compareDeep(name, o.name, true) && compareDeep(strength, o.strength, true) && compareDeep(description, o.description, true)
+ return compareDeep(strength, o.strength, true) && compareDeep(description, o.description, true)
&& compareDeep(valueSet, o.valueSet, true);
}
@@ -1492,14 +1434,13 @@ public class ElementDefinition extends Type implements ICompositeType {
if (!(other instanceof ElementDefinitionBindingComponent))
return false;
ElementDefinitionBindingComponent o = (ElementDefinitionBindingComponent) other;
- return compareValues(name, o.name, true) && compareValues(strength, o.strength, true) && compareValues(description, o.description, true)
+ return compareValues(strength, o.strength, true) && compareValues(description, o.description, true)
;
}
public boolean isEmpty() {
- return super.isEmpty() && (name == null || name.isEmpty()) && (strength == null || strength.isEmpty())
- && (description == null || description.isEmpty()) && (valueSet == null || valueSet.isEmpty())
- ;
+ return super.isEmpty() && (strength == null || strength.isEmpty()) && (description == null || description.isEmpty())
+ && (valueSet == null || valueSet.isEmpty());
}
}
@@ -1774,7 +1715,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_;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java
index b73a953c311..c65315eabae 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java
index fe3112f7994..c12aa61ff21 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java
index 7227117195a..bcaf54366c4 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java
index ae09e1d9d43..e098a0659cd 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java
index 0e9586b0ee9..68d00259877 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java
index a937dde675b..569ada8adf1 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Enumerations.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import org.hl7.fhir.instance.model.api.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java
index 88abdade2ca..4f888870309 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java
index e052eb4106b..a1a52243290 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java
index 5e89fe59572..50956309c47 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java
index 393c6614ece..fc229c6159b 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java
index f4ec1494aa5..e027a9362f6 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Flag.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java
index 4d9798b8191..e0625fb3df5 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java
index c7946935ab6..f9e5c9e51bf 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java
index 236a518e8f7..c567110abfe 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java
index 019238eb77d..eab78e9ec78 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java
index 0cf0a10246f..55e0ca9e43c 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java
index f2c87f34b71..72a3afabddc 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java
index 4dc362f5093..86de2408de7 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -146,792 +146,6 @@ public class ImagingStudy extends DomainResource {
}
}
- public enum Modality {
- /**
- * null
- */
- AR,
- /**
- * null
- */
- AU,
- /**
- * null
- */
- BDUS,
- /**
- * null
- */
- BI,
- /**
- * null
- */
- BMD,
- /**
- * null
- */
- CR,
- /**
- * null
- */
- CT,
- /**
- * null
- */
- DG,
- /**
- * null
- */
- DX,
- /**
- * null
- */
- ECG,
- /**
- * null
- */
- EPS,
- /**
- * null
- */
- ES,
- /**
- * null
- */
- GM,
- /**
- * null
- */
- HC,
- /**
- * null
- */
- HD,
- /**
- * null
- */
- IO,
- /**
- * null
- */
- IVOCT,
- /**
- * null
- */
- IVUS,
- /**
- * null
- */
- KER,
- /**
- * null
- */
- KO,
- /**
- * null
- */
- LEN,
- /**
- * null
- */
- LS,
- /**
- * null
- */
- MG,
- /**
- * null
- */
- MR,
- /**
- * null
- */
- NM,
- /**
- * null
- */
- OAM,
- /**
- * null
- */
- OCT,
- /**
- * null
- */
- OP,
- /**
- * null
- */
- OPM,
- /**
- * null
- */
- OPT,
- /**
- * null
- */
- OPV,
- /**
- * null
- */
- OT,
- /**
- * null
- */
- PR,
- /**
- * null
- */
- PT,
- /**
- * null
- */
- PX,
- /**
- * null
- */
- REG,
- /**
- * null
- */
- RF,
- /**
- * null
- */
- RG,
- /**
- * null
- */
- RTDOSE,
- /**
- * null
- */
- RTIMAGE,
- /**
- * null
- */
- RTPLAN,
- /**
- * null
- */
- RTRECORD,
- /**
- * null
- */
- RTSTRUCT,
- /**
- * null
- */
- SEG,
- /**
- * null
- */
- SM,
- /**
- * null
- */
- SMR,
- /**
- * null
- */
- SR,
- /**
- * null
- */
- SRF,
- /**
- * null
- */
- TG,
- /**
- * null
- */
- US,
- /**
- * null
- */
- VA,
- /**
- * null
- */
- XA,
- /**
- * null
- */
- XC,
- /**
- * added to help the parsers
- */
- NULL;
- public static Modality fromCode(String codeString) throws Exception {
- if (codeString == null || "".equals(codeString))
- return null;
- if ("AR".equals(codeString))
- return AR;
- if ("AU".equals(codeString))
- return AU;
- if ("BDUS".equals(codeString))
- return BDUS;
- if ("BI".equals(codeString))
- return BI;
- if ("BMD".equals(codeString))
- return BMD;
- if ("CR".equals(codeString))
- return CR;
- if ("CT".equals(codeString))
- return CT;
- if ("DG".equals(codeString))
- return DG;
- if ("DX".equals(codeString))
- return DX;
- if ("ECG".equals(codeString))
- return ECG;
- if ("EPS".equals(codeString))
- return EPS;
- if ("ES".equals(codeString))
- return ES;
- if ("GM".equals(codeString))
- return GM;
- if ("HC".equals(codeString))
- return HC;
- 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 ("KO".equals(codeString))
- return KO;
- if ("LEN".equals(codeString))
- return LEN;
- if ("LS".equals(codeString))
- return LS;
- if ("MG".equals(codeString))
- return MG;
- if ("MR".equals(codeString))
- return MR;
- if ("NM".equals(codeString))
- return NM;
- if ("OAM".equals(codeString))
- return OAM;
- if ("OCT".equals(codeString))
- return OCT;
- if ("OP".equals(codeString))
- return OP;
- if ("OPM".equals(codeString))
- return OPM;
- if ("OPT".equals(codeString))
- return OPT;
- if ("OPV".equals(codeString))
- return OPV;
- if ("OT".equals(codeString))
- return OT;
- if ("PR".equals(codeString))
- return PR;
- if ("PT".equals(codeString))
- return PT;
- if ("PX".equals(codeString))
- return PX;
- if ("REG".equals(codeString))
- return REG;
- if ("RF".equals(codeString))
- return RF;
- if ("RG".equals(codeString))
- return RG;
- if ("RTDOSE".equals(codeString))
- return RTDOSE;
- if ("RTIMAGE".equals(codeString))
- return RTIMAGE;
- if ("RTPLAN".equals(codeString))
- return RTPLAN;
- if ("RTRECORD".equals(codeString))
- return RTRECORD;
- if ("RTSTRUCT".equals(codeString))
- return RTSTRUCT;
- if ("SEG".equals(codeString))
- return SEG;
- if ("SM".equals(codeString))
- return SM;
- if ("SMR".equals(codeString))
- return SMR;
- if ("SR".equals(codeString))
- return SR;
- if ("SRF".equals(codeString))
- return SRF;
- if ("TG".equals(codeString))
- return TG;
- if ("US".equals(codeString))
- return US;
- if ("VA".equals(codeString))
- return VA;
- if ("XA".equals(codeString))
- return XA;
- if ("XC".equals(codeString))
- return XC;
- throw new Exception("Unknown Modality code '"+codeString+"'");
- }
- public String toCode() {
- switch (this) {
- case AR: return "AR";
- case AU: return "AU";
- case BDUS: return "BDUS";
- case BI: return "BI";
- case BMD: return "BMD";
- case CR: return "CR";
- case CT: return "CT";
- case DG: return "DG";
- case DX: return "DX";
- case ECG: return "ECG";
- case EPS: return "EPS";
- case ES: return "ES";
- case GM: return "GM";
- case HC: return "HC";
- case HD: return "HD";
- case IO: return "IO";
- case IVOCT: return "IVOCT";
- case IVUS: return "IVUS";
- case KER: return "KER";
- case KO: return "KO";
- case LEN: return "LEN";
- case LS: return "LS";
- case MG: return "MG";
- case MR: return "MR";
- case NM: return "NM";
- case OAM: return "OAM";
- case OCT: return "OCT";
- case OP: return "OP";
- case OPM: return "OPM";
- case OPT: return "OPT";
- case OPV: return "OPV";
- case OT: return "OT";
- case PR: return "PR";
- case PT: return "PT";
- case PX: return "PX";
- case REG: return "REG";
- case RF: return "RF";
- case RG: return "RG";
- case RTDOSE: return "RTDOSE";
- case RTIMAGE: return "RTIMAGE";
- case RTPLAN: return "RTPLAN";
- case RTRECORD: return "RTRECORD";
- case RTSTRUCT: return "RTSTRUCT";
- case SEG: return "SEG";
- case SM: return "SM";
- case SMR: return "SMR";
- case SR: return "SR";
- case SRF: return "SRF";
- case TG: return "TG";
- case US: return "US";
- case VA: return "VA";
- case XA: return "XA";
- case XC: return "XC";
- default: return "?";
- }
- }
- public String getSystem() {
- switch (this) {
- case AR: return "http://nema.org/dicom/dicm";
- case AU: return "http://nema.org/dicom/dicm";
- case BDUS: return "http://nema.org/dicom/dicm";
- case BI: return "http://nema.org/dicom/dicm";
- case BMD: return "http://nema.org/dicom/dicm";
- case CR: return "http://nema.org/dicom/dicm";
- case CT: return "http://nema.org/dicom/dicm";
- case DG: return "http://nema.org/dicom/dicm";
- case DX: return "http://nema.org/dicom/dicm";
- case ECG: return "http://nema.org/dicom/dicm";
- case EPS: return "http://nema.org/dicom/dicm";
- case ES: return "http://nema.org/dicom/dicm";
- case GM: return "http://nema.org/dicom/dicm";
- case HC: 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 KO: return "http://nema.org/dicom/dicm";
- case LEN: return "http://nema.org/dicom/dicm";
- case LS: return "http://nema.org/dicom/dicm";
- case MG: return "http://nema.org/dicom/dicm";
- case MR: 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 OP: return "http://nema.org/dicom/dicm";
- case OPM: return "http://nema.org/dicom/dicm";
- case OPT: return "http://nema.org/dicom/dicm";
- case OPV: return "http://nema.org/dicom/dicm";
- case OT: return "http://nema.org/dicom/dicm";
- case PR: return "http://nema.org/dicom/dicm";
- case PT: return "http://nema.org/dicom/dicm";
- case PX: return "http://nema.org/dicom/dicm";
- case REG: return "http://nema.org/dicom/dicm";
- case RF: return "http://nema.org/dicom/dicm";
- case RG: return "http://nema.org/dicom/dicm";
- case RTDOSE: return "http://nema.org/dicom/dicm";
- case RTIMAGE: return "http://nema.org/dicom/dicm";
- case RTPLAN: return "http://nema.org/dicom/dicm";
- case RTRECORD: return "http://nema.org/dicom/dicm";
- case RTSTRUCT: return "http://nema.org/dicom/dicm";
- case SEG: return "http://nema.org/dicom/dicm";
- case SM: return "http://nema.org/dicom/dicm";
- case SMR: return "http://nema.org/dicom/dicm";
- case SR: return "http://nema.org/dicom/dicm";
- case SRF: return "http://nema.org/dicom/dicm";
- case TG: 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";
- case XC: return "http://nema.org/dicom/dicm";
- default: return "?";
- }
- }
- public String getDefinition() {
- switch (this) {
- case AR: return "";
- case AU: return "";
- case BDUS: return "";
- case BI: return "";
- case BMD: return "";
- case CR: return "";
- case CT: return "";
- case DG: return "";
- case DX: return "";
- case ECG: return "";
- case EPS: return "";
- case ES: return "";
- case GM: return "";
- case HC: return "";
- case HD: return "";
- case IO: return "";
- case IVOCT: return "";
- case IVUS: return "";
- case KER: return "";
- case KO: return "";
- case LEN: return "";
- case LS: return "";
- case MG: return "";
- case MR: return "";
- case NM: return "";
- case OAM: return "";
- case OCT: return "";
- case OP: return "";
- case OPM: return "";
- case OPT: return "";
- case OPV: return "";
- case OT: return "";
- case PR: return "";
- case PT: return "";
- case PX: return "";
- case REG: return "";
- case RF: return "";
- case RG: return "";
- case RTDOSE: return "";
- case RTIMAGE: return "";
- case RTPLAN: return "";
- case RTRECORD: return "";
- case RTSTRUCT: return "";
- case SEG: return "";
- case SM: return "";
- case SMR: return "";
- case SR: return "";
- case SRF: return "";
- case TG: return "";
- case US: return "";
- case VA: return "";
- case XA: return "";
- case XC: return "";
- default: return "?";
- }
- }
- public String getDisplay() {
- switch (this) {
- case AR: return "AR";
- case AU: return "AU";
- case BDUS: return "BDUS";
- case BI: return "BI";
- case BMD: return "BMD";
- case CR: return "CR";
- case CT: return "CT";
- case DG: return "DG";
- case DX: return "DX";
- case ECG: return "ECG";
- case EPS: return "EPS";
- case ES: return "ES";
- case GM: return "GM";
- case HC: return "HC";
- case HD: return "HD";
- case IO: return "IO";
- case IVOCT: return "IVOCT";
- case IVUS: return "IVUS";
- case KER: return "KER";
- case KO: return "KO";
- case LEN: return "LEN";
- case LS: return "LS";
- case MG: return "MG";
- case MR: return "MR";
- case NM: return "NM";
- case OAM: return "OAM";
- case OCT: return "OCT";
- case OP: return "OP";
- case OPM: return "OPM";
- case OPT: return "OPT";
- case OPV: return "OPV";
- case OT: return "OT";
- case PR: return "PR";
- case PT: return "PT";
- case PX: return "PX";
- case REG: return "REG";
- case RF: return "RF";
- case RG: return "RG";
- case RTDOSE: return "RTDOSE";
- case RTIMAGE: return "RTIMAGE";
- case RTPLAN: return "RTPLAN";
- case RTRECORD: return "RTRECORD";
- case RTSTRUCT: return "RTSTRUCT";
- case SEG: return "SEG";
- case SM: return "SM";
- case SMR: return "SMR";
- case SR: return "SR";
- case SRF: return "SRF";
- case TG: return "TG";
- case US: return "US";
- case VA: return "VA";
- case XA: return "XA";
- case XC: return "XC";
- default: return "?";
- }
- }
- }
-
- public static class ModalityEnumFactory implements EnumFactory {
- public Modality fromCode(String codeString) throws IllegalArgumentException {
- if (codeString == null || "".equals(codeString))
- if (codeString == null || "".equals(codeString))
- return null;
- if ("AR".equals(codeString))
- return Modality.AR;
- if ("AU".equals(codeString))
- return Modality.AU;
- if ("BDUS".equals(codeString))
- return Modality.BDUS;
- if ("BI".equals(codeString))
- return Modality.BI;
- if ("BMD".equals(codeString))
- return Modality.BMD;
- if ("CR".equals(codeString))
- return Modality.CR;
- if ("CT".equals(codeString))
- return Modality.CT;
- if ("DG".equals(codeString))
- return Modality.DG;
- if ("DX".equals(codeString))
- return Modality.DX;
- if ("ECG".equals(codeString))
- return Modality.ECG;
- if ("EPS".equals(codeString))
- return Modality.EPS;
- if ("ES".equals(codeString))
- return Modality.ES;
- if ("GM".equals(codeString))
- return Modality.GM;
- if ("HC".equals(codeString))
- return Modality.HC;
- if ("HD".equals(codeString))
- return Modality.HD;
- if ("IO".equals(codeString))
- return Modality.IO;
- if ("IVOCT".equals(codeString))
- return Modality.IVOCT;
- if ("IVUS".equals(codeString))
- return Modality.IVUS;
- if ("KER".equals(codeString))
- return Modality.KER;
- if ("KO".equals(codeString))
- return Modality.KO;
- if ("LEN".equals(codeString))
- return Modality.LEN;
- if ("LS".equals(codeString))
- return Modality.LS;
- if ("MG".equals(codeString))
- return Modality.MG;
- if ("MR".equals(codeString))
- return Modality.MR;
- if ("NM".equals(codeString))
- return Modality.NM;
- if ("OAM".equals(codeString))
- return Modality.OAM;
- if ("OCT".equals(codeString))
- return Modality.OCT;
- if ("OP".equals(codeString))
- return Modality.OP;
- if ("OPM".equals(codeString))
- return Modality.OPM;
- if ("OPT".equals(codeString))
- return Modality.OPT;
- if ("OPV".equals(codeString))
- return Modality.OPV;
- if ("OT".equals(codeString))
- return Modality.OT;
- if ("PR".equals(codeString))
- return Modality.PR;
- if ("PT".equals(codeString))
- return Modality.PT;
- if ("PX".equals(codeString))
- return Modality.PX;
- if ("REG".equals(codeString))
- return Modality.REG;
- if ("RF".equals(codeString))
- return Modality.RF;
- if ("RG".equals(codeString))
- return Modality.RG;
- if ("RTDOSE".equals(codeString))
- return Modality.RTDOSE;
- if ("RTIMAGE".equals(codeString))
- return Modality.RTIMAGE;
- if ("RTPLAN".equals(codeString))
- return Modality.RTPLAN;
- if ("RTRECORD".equals(codeString))
- return Modality.RTRECORD;
- if ("RTSTRUCT".equals(codeString))
- return Modality.RTSTRUCT;
- if ("SEG".equals(codeString))
- return Modality.SEG;
- if ("SM".equals(codeString))
- return Modality.SM;
- if ("SMR".equals(codeString))
- return Modality.SMR;
- if ("SR".equals(codeString))
- return Modality.SR;
- if ("SRF".equals(codeString))
- return Modality.SRF;
- if ("TG".equals(codeString))
- return Modality.TG;
- if ("US".equals(codeString))
- return Modality.US;
- if ("VA".equals(codeString))
- return Modality.VA;
- if ("XA".equals(codeString))
- return Modality.XA;
- if ("XC".equals(codeString))
- return Modality.XC;
- throw new IllegalArgumentException("Unknown Modality code '"+codeString+"'");
- }
- public String toCode(Modality code) {
- if (code == Modality.AR)
- return "AR";
- if (code == Modality.AU)
- return "AU";
- if (code == Modality.BDUS)
- return "BDUS";
- if (code == Modality.BI)
- return "BI";
- if (code == Modality.BMD)
- return "BMD";
- if (code == Modality.CR)
- return "CR";
- if (code == Modality.CT)
- return "CT";
- if (code == Modality.DG)
- return "DG";
- if (code == Modality.DX)
- return "DX";
- if (code == Modality.ECG)
- return "ECG";
- if (code == Modality.EPS)
- return "EPS";
- if (code == Modality.ES)
- return "ES";
- if (code == Modality.GM)
- return "GM";
- if (code == Modality.HC)
- return "HC";
- if (code == Modality.HD)
- return "HD";
- if (code == Modality.IO)
- return "IO";
- if (code == Modality.IVOCT)
- return "IVOCT";
- if (code == Modality.IVUS)
- return "IVUS";
- if (code == Modality.KER)
- return "KER";
- if (code == Modality.KO)
- return "KO";
- if (code == Modality.LEN)
- return "LEN";
- if (code == Modality.LS)
- return "LS";
- if (code == Modality.MG)
- return "MG";
- if (code == Modality.MR)
- return "MR";
- if (code == Modality.NM)
- return "NM";
- if (code == Modality.OAM)
- return "OAM";
- if (code == Modality.OCT)
- return "OCT";
- if (code == Modality.OP)
- return "OP";
- if (code == Modality.OPM)
- return "OPM";
- if (code == Modality.OPT)
- return "OPT";
- if (code == Modality.OPV)
- return "OPV";
- if (code == Modality.OT)
- return "OT";
- if (code == Modality.PR)
- return "PR";
- if (code == Modality.PT)
- return "PT";
- if (code == Modality.PX)
- return "PX";
- if (code == Modality.REG)
- return "REG";
- if (code == Modality.RF)
- return "RF";
- if (code == Modality.RG)
- return "RG";
- if (code == Modality.RTDOSE)
- return "RTDOSE";
- if (code == Modality.RTIMAGE)
- return "RTIMAGE";
- if (code == Modality.RTPLAN)
- return "RTPLAN";
- if (code == Modality.RTRECORD)
- return "RTRECORD";
- if (code == Modality.RTSTRUCT)
- return "RTSTRUCT";
- if (code == Modality.SEG)
- return "SEG";
- if (code == Modality.SM)
- return "SM";
- if (code == Modality.SMR)
- return "SMR";
- if (code == Modality.SR)
- return "SR";
- if (code == Modality.SRF)
- return "SRF";
- if (code == Modality.TG)
- return "TG";
- if (code == Modality.US)
- return "US";
- if (code == Modality.VA)
- return "VA";
- if (code == Modality.XA)
- return "XA";
- if (code == Modality.XC)
- return "XC";
- return "?";
- }
- }
-
@Block()
public static class ImagingStudySeriesComponent extends BackboneElement implements IBaseBackboneElement {
/**
@@ -944,9 +158,9 @@ public class ImagingStudy extends DomainResource {
/**
* The modality of this series sequence.
*/
- @Child(name = "modality", type = {CodeType.class}, order=2, min=1, max=1)
+ @Child(name = "modality", type = {Coding.class}, order=2, min=1, max=1)
@Description(shortDefinition="The modality of the instances in the series (0008,0060)", formalDefinition="The modality of this series sequence." )
- protected Enumeration modality;
+ protected Coding modality;
/**
* Formal identifier for this series.
@@ -1011,7 +225,7 @@ public class ImagingStudy extends DomainResource {
@Description(shortDefinition="A single instance taken from a patient (image or other)", formalDefinition="A single SOP Instance within the series, e.g., an image, or presentation state." )
protected List instance;
- private static final long serialVersionUID = 1186612269L;
+ private static final long serialVersionUID = -873161275L;
/*
* Constructor
@@ -1023,7 +237,7 @@ public class ImagingStudy extends DomainResource {
/*
* Constructor
*/
- public ImagingStudySeriesComponent(Enumeration modality, OidType uid, UnsignedIntType numberOfInstances) {
+ public ImagingStudySeriesComponent(Coding modality, OidType uid, UnsignedIntType numberOfInstances) {
super();
this.modality = modality;
this.uid = uid;
@@ -1076,50 +290,29 @@ public class ImagingStudy extends DomainResource {
}
/**
- * @return {@link #modality} (The modality of this series sequence.). This is the underlying object with id, value and extensions. The accessor "getModality" gives direct access to the value
+ * @return {@link #modality} (The modality of this series sequence.)
*/
- public Enumeration getModalityElement() {
+ public Coding getModality() {
if (this.modality == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create ImagingStudySeriesComponent.modality");
else if (Configuration.doAutoCreate())
- this.modality = new Enumeration(new ModalityEnumFactory()); // bb
+ this.modality = new Coding(); // cc
return this.modality;
}
- public boolean hasModalityElement() {
- return this.modality != null && !this.modality.isEmpty();
- }
-
public boolean hasModality() {
return this.modality != null && !this.modality.isEmpty();
}
/**
- * @param value {@link #modality} (The modality of this series sequence.). This is the underlying object with id, value and extensions. The accessor "getModality" gives direct access to the value
+ * @param value {@link #modality} (The modality of this series sequence.)
*/
- public ImagingStudySeriesComponent setModalityElement(Enumeration value) {
+ public ImagingStudySeriesComponent setModality(Coding value) {
this.modality = value;
return this;
}
- /**
- * @return The modality of this series sequence.
- */
- public Modality getModality() {
- return this.modality == null ? null : this.modality.getValue();
- }
-
- /**
- * @param value The modality of this series sequence.
- */
- public ImagingStudySeriesComponent setModality(Modality value) {
- if (this.modality == null)
- this.modality = new Enumeration(new ModalityEnumFactory());
- this.modality.setValue(value);
- return this;
- }
-
/**
* @return {@link #uid} (Formal identifier for this series.). This is the underlying object with id, value and extensions. The accessor "getUid" gives direct access to the value
*/
@@ -1497,7 +690,7 @@ public class ImagingStudy extends DomainResource {
protected void listChildren(List childrenList) {
super.listChildren(childrenList);
childrenList.add(new Property("number", "unsignedInt", "The Numeric identifier of this series in the study.", 0, java.lang.Integer.MAX_VALUE, number));
- childrenList.add(new Property("modality", "code", "The modality of this series sequence.", 0, java.lang.Integer.MAX_VALUE, modality));
+ childrenList.add(new Property("modality", "Coding", "The modality of this series sequence.", 0, java.lang.Integer.MAX_VALUE, modality));
childrenList.add(new Property("uid", "oid", "Formal identifier for this series.", 0, java.lang.Integer.MAX_VALUE, uid));
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));
@@ -1551,10 +744,9 @@ public class ImagingStudy extends DomainResource {
if (!(other instanceof ImagingStudySeriesComponent))
return false;
ImagingStudySeriesComponent o = (ImagingStudySeriesComponent) other;
- return compareValues(number, o.number, true) && compareValues(modality, o.modality, true) && compareValues(uid, o.uid, true)
- && compareValues(description, o.description, true) && compareValues(numberOfInstances, o.numberOfInstances, true)
- && compareValues(availability, o.availability, true) && compareValues(url, o.url, true) && compareValues(dateTime, o.dateTime, true)
- ;
+ return compareValues(number, o.number, true) && compareValues(uid, o.uid, true) && compareValues(description, o.description, true)
+ && compareValues(numberOfInstances, o.numberOfInstances, true) && compareValues(availability, o.availability, true)
+ && compareValues(url, o.url, true) && compareValues(dateTime, o.dateTime, true);
}
public boolean isEmpty() {
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java
index 3f8cb7290b2..c0cee39ad82 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java
index f656e874d50..20807c7316c 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java
index 55dfeb18f1a..609998dee03 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -1413,14 +1413,14 @@ public class ImplementationGuide extends DomainResource {
/**
* A logical set of resources that is a section in the implementation Guide.
*/
- @Child(name = "package_", type = {}, order=14, min=1, max=Child.MAX_UNLIMITED)
+ @Child(name = "package", type = {}, order=14, min=1, max=Child.MAX_UNLIMITED)
@Description(shortDefinition="A section in the IG", formalDefinition="A logical set of resources that is a section in the implementation Guide." )
protected List package_;
/**
* A default profile that applies to a particular resource type. Whenever a resource type is referenced in any structure definition (explicitly, or by inheritance from the base specification), and no explicit profile is applied, then this default profile applies.
*/
- @Child(name = "default_", type = {}, order=15, min=0, max=Child.MAX_UNLIMITED)
+ @Child(name = "default", type = {}, order=15, min=0, max=Child.MAX_UNLIMITED)
@Description(shortDefinition="Applies when no explicit profile applied", formalDefinition="A default profile that applies to a particular resource type. Whenever a resource type is referenced in any structure definition (explicitly, or by inheritance from the base specification), and no explicit profile is applied, then this default profile applies." )
protected List default_;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java
index ae1d9f888eb..8b5fb8dec5a 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -527,14 +527,14 @@ public class List_ extends DomainResource {
protected Resource subjectTarget;
/**
- * The entity responsible for deciding what the contents of the list were.
+ * The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.
*/
@Child(name = "source", type = {Practitioner.class, Patient.class, Device.class}, order=4, min=0, max=1)
- @Description(shortDefinition="Who and/or what defined the list contents", formalDefinition="The entity responsible for deciding what the contents of the list were." )
+ @Description(shortDefinition="Who and/or what defined the list contents (aka Author)", formalDefinition="The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list." )
protected Reference source;
/**
- * The actual object that is the target of the reference (The entity responsible for deciding what the contents of the list were.)
+ * The actual object that is the target of the reference (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
*/
protected Resource sourceTarget;
@@ -770,7 +770,7 @@ public class List_ extends DomainResource {
}
/**
- * @return {@link #source} (The entity responsible for deciding what the contents of the list were.)
+ * @return {@link #source} (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
*/
public Reference getSource() {
if (this.source == null)
@@ -786,7 +786,7 @@ public class List_ extends DomainResource {
}
/**
- * @param value {@link #source} (The entity responsible for deciding what the contents of the list were.)
+ * @param value {@link #source} (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
*/
public List_ setSource(Reference value) {
this.source = value;
@@ -794,14 +794,14 @@ public class List_ 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. (The entity responsible for deciding what the contents of the list were.)
+ * @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. (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
*/
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. (The entity responsible for deciding what the contents of the list were.)
+ * @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. (The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.)
*/
public List_ setSourceTarget(Resource value) {
this.sourceTarget = value;
@@ -1134,7 +1134,7 @@ public class List_ extends DomainResource {
childrenList.add(new Property("title", "string", "A label for the list assigned by the author.", 0, java.lang.Integer.MAX_VALUE, title));
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("source", "Reference(Practitioner|Patient|Device)", "The entity responsible for deciding what the contents of the list were. Where the list was created by a human, this is the same as the author of the list.", 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));
@@ -1228,7 +1228,7 @@ public class List_ extends DomainResource {
public static final String SP_SUBJECT = "subject";
@SearchParamDefinition(name="patient", path="List.subject", description="If all resources have the same subject", type="reference" )
public static final String SP_PATIENT = "patient";
- @SearchParamDefinition(name="source", path="List.source", description="Who and/or what defined the list contents", type="reference" )
+ @SearchParamDefinition(name="source", path="List.source", description="Who and/or what defined the list contents (aka Author)", 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";
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java
index b1eb473dc68..b6436cced57 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java
index ffad4600c8c..a73855620b7 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java
index 4e84e42ee8b..2ca1eec299c 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java
index 2b39d1e42d0..f81ff452892 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java
index 0eb26b97b32..1d346344f88 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java
index 8acd2c447cc..7606d4fe5dc 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java
index b1bbfc75c83..10be340ad43 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java
index e5d64256275..8280467b598 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java
index ef5b2041f31..6ec6748764a 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java
index 62e3ebdd010..3a9a10a1c65 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 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;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java
index 29155ec1eef..e23f8deeca7 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java
index f8864485dcb..62545ab06df 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
import org.hl7.fhir.utilities.xhtml.XhtmlNode;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java
index f46f9816e76..786de3c1333 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java
index 8a294938773..3624ff94d8f 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java
index 6a39ef4dc92..daf28b2211d 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java
index 28159eda931..073886a24f5 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java
index dcb26ea9241..1fadf3d3767 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java
index 9ee515db303..550655f39c1 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java
+++ b/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 Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java
index f2d14bcf149..f36c346499f 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java
index 3e871003f7b..19442950927 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java
index 3fc97e4d5b1..a74d7871b09 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java
index a22b89073e3..679955d89cb 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java
index 030268151d1..aef3ba78bff 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java
index f5305b5a560..146d9cbe4eb 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java
index 6a111eaa422..e6121c7baa6 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java
index 4f1c126c2e0..d6d45865c10 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java
index 54324d97975..115b4044e4e 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java
index 6602659b6de..27c3f99c857 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java
index 2596a39549c..f5857a3480b 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java
index 2426f5715b0..ae2bcf0d17f 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java
index e72eb1186d7..799c28f8590 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java
index f1b66dd1ee7..37483e7b1ca 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java
index b8e0b409b24..36f22b00d57 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireAnswers.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireAnswers.java
index a9270570c28..c61133e746c 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireAnswers.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireAnswers.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java
index 56dda6c2233..ac7b6c1c32d 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java
index 0e8f38d2f7f..f7300f785dd 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java
index cd391ceb0a2..ee67f193bcd 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java
index 64eca5f13a0..a651587c596 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java
index 5c8c7989cc3..d028d5ed5dc 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java
index 97ce6545f2b..65164f0dccc 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java
index 5cbb1a55556..86ee4f58347 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
public class ResourceFactory extends Factory {
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java
index 0dbd1b96576..b4dacde3317 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java
@@ -1,6 +1,6 @@
package org.hl7.fhir.instance.model;
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
public enum ResourceType {
Account,
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java
index 8645582c33f..8eb8739517a 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java
index b76cbd3650f..43e9f6881be 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java
index 2bd4f7596cc..1971ddb3732 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java
index 3cd4fa39c79..9c7a2d249b8 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java
index 53e0e3ec843..5aa2666d6fd 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java
@@ -29,17 +29,19 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.instance.model.Enumerations.*;
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.*;
/**
- * An XML digital signature along with supporting context.
+ * A digital signature along with supporting context. The signature may be electronic/cryptographic in nature, or a graphical image representing a hand-written signature, or a signature process. Different Signature approaches have different utilities.
*/
@DatatypeDef(name="Signature")
public class Signature extends Type implements ICompositeType {
@@ -66,13 +68,20 @@ public class Signature extends Type implements ICompositeType {
protected Type who;
/**
- * The base64 encoding of the XML-Signature.
+ * A mime type that indicates the technical format of the signature. Important mime types are application/signature+xml for X ML DigSig, application/jwt for JWT, and image/* for a graphical image of a signature.
*/
- @Child(name = "blob", type = {Base64BinaryType.class}, order=3, min=1, max=1)
- @Description(shortDefinition="The actual XML Dig-Sig", formalDefinition="The base64 encoding of the XML-Signature." )
+ @Child(name = "contentType", type = {CodeType.class}, order=3, min=1, max=1)
+ @Description(shortDefinition="The technical format of the signature", formalDefinition="A mime type that indicates the technical format of the signature. Important mime types are application/signature+xml for X ML DigSig, application/jwt for JWT, and image/* for a graphical image of a signature." )
+ protected CodeType contentType;
+
+ /**
+ * The base64 encoding of the Signature content.
+ */
+ @Child(name = "blob", type = {Base64BinaryType.class}, order=4, min=1, max=1)
+ @Description(shortDefinition="The actual signature content (XML DigSig. JWT, picture, etc)", formalDefinition="The base64 encoding of the Signature content." )
protected Base64BinaryType blob;
- private static final long serialVersionUID = 1072581988L;
+ private static final long serialVersionUID = -452432714L;
/*
* Constructor
@@ -84,10 +93,11 @@ public class Signature extends Type implements ICompositeType {
/*
* Constructor
*/
- public Signature(InstantType when, Type who, Base64BinaryType blob) {
+ public Signature(InstantType when, Type who, CodeType contentType, Base64BinaryType blob) {
super();
this.when = when;
this.who = who;
+ this.contentType = contentType;
this.blob = blob;
}
@@ -222,7 +232,52 @@ public class Signature extends Type implements ICompositeType {
}
/**
- * @return {@link #blob} (The base64 encoding of the XML-Signature.). This is the underlying object with id, value and extensions. The accessor "getBlob" gives direct access to the value
+ * @return {@link #contentType} (A mime type that indicates the technical format of the signature. Important mime types are application/signature+xml for X ML DigSig, application/jwt for JWT, and image/* for a graphical image of a signature.). This is the underlying object with id, value and extensions. The accessor "getContentType" gives direct access to the value
+ */
+ public CodeType getContentTypeElement() {
+ if (this.contentType == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create Signature.contentType");
+ else if (Configuration.doAutoCreate())
+ this.contentType = new CodeType(); // bb
+ return this.contentType;
+ }
+
+ public boolean hasContentTypeElement() {
+ return this.contentType != null && !this.contentType.isEmpty();
+ }
+
+ public boolean hasContentType() {
+ return this.contentType != null && !this.contentType.isEmpty();
+ }
+
+ /**
+ * @param value {@link #contentType} (A mime type that indicates the technical format of the signature. Important mime types are application/signature+xml for X ML DigSig, application/jwt for JWT, and image/* for a graphical image of a signature.). This is the underlying object with id, value and extensions. The accessor "getContentType" gives direct access to the value
+ */
+ public Signature setContentTypeElement(CodeType value) {
+ this.contentType = value;
+ return this;
+ }
+
+ /**
+ * @return A mime type that indicates the technical format of the signature. Important mime types are application/signature+xml for X ML DigSig, application/jwt for JWT, and image/* for a graphical image of a signature.
+ */
+ public String getContentType() {
+ return this.contentType == null ? null : this.contentType.getValue();
+ }
+
+ /**
+ * @param value A mime type that indicates the technical format of the signature. Important mime types are application/signature+xml for X ML DigSig, application/jwt for JWT, and image/* for a graphical image of a signature.
+ */
+ public Signature setContentType(String value) {
+ if (this.contentType == null)
+ this.contentType = new CodeType();
+ this.contentType.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #blob} (The base64 encoding of the Signature content.). This is the underlying object with id, value and extensions. The accessor "getBlob" gives direct access to the value
*/
public Base64BinaryType getBlobElement() {
if (this.blob == null)
@@ -242,7 +297,7 @@ public class Signature extends Type implements ICompositeType {
}
/**
- * @param value {@link #blob} (The base64 encoding of the XML-Signature.). This is the underlying object with id, value and extensions. The accessor "getBlob" gives direct access to the value
+ * @param value {@link #blob} (The base64 encoding of the Signature content.). This is the underlying object with id, value and extensions. The accessor "getBlob" gives direct access to the value
*/
public Signature setBlobElement(Base64BinaryType value) {
this.blob = value;
@@ -250,14 +305,14 @@ public class Signature extends Type implements ICompositeType {
}
/**
- * @return The base64 encoding of the XML-Signature.
+ * @return The base64 encoding of the Signature content.
*/
public byte[] getBlob() {
return this.blob == null ? null : this.blob.getValue();
}
/**
- * @param value The base64 encoding of the XML-Signature.
+ * @param value The base64 encoding of the Signature content.
*/
public Signature setBlob(byte[] value) {
if (this.blob == null)
@@ -271,7 +326,8 @@ public class Signature extends Type implements ICompositeType {
childrenList.add(new Property("type", "Coding", "An indication of the reason that the entity signed this document. This may be explicitly included as part of the signature information and can be used when determining accountability for various actions concerning the document.", 0, java.lang.Integer.MAX_VALUE, type));
childrenList.add(new Property("when", "instant", "When the digital signature was signed.", 0, java.lang.Integer.MAX_VALUE, when));
childrenList.add(new Property("who[x]", "uri|Reference(Practitioner|RelatedPerson|Patient)", "A reference to an application-usable description of the person that signed the certificate (e.g. the signature used their private key).", 0, java.lang.Integer.MAX_VALUE, who));
- childrenList.add(new Property("blob", "base64Binary", "The base64 encoding of the XML-Signature.", 0, java.lang.Integer.MAX_VALUE, blob));
+ childrenList.add(new Property("contentType", "code", "A mime type that indicates the technical format of the signature. Important mime types are application/signature+xml for X ML DigSig, application/jwt for JWT, and image/* for a graphical image of a signature.", 0, java.lang.Integer.MAX_VALUE, contentType));
+ childrenList.add(new Property("blob", "base64Binary", "The base64 encoding of the Signature content.", 0, java.lang.Integer.MAX_VALUE, blob));
}
public Signature copy() {
@@ -284,6 +340,7 @@ public class Signature extends Type implements ICompositeType {
};
dst.when = when == null ? null : when.copy();
dst.who = who == null ? null : who.copy();
+ dst.contentType = contentType == null ? null : contentType.copy();
dst.blob = blob == null ? null : blob.copy();
return dst;
}
@@ -300,7 +357,7 @@ public class Signature extends Type implements ICompositeType {
return false;
Signature o = (Signature) other;
return compareDeep(type, o.type, true) && compareDeep(when, o.when, true) && compareDeep(who, o.who, true)
- && compareDeep(blob, o.blob, true);
+ && compareDeep(contentType, o.contentType, true) && compareDeep(blob, o.blob, true);
}
@Override
@@ -310,12 +367,14 @@ public class Signature extends Type implements ICompositeType {
if (!(other instanceof Signature))
return false;
Signature o = (Signature) other;
- return compareValues(when, o.when, true) && compareValues(blob, o.blob, true);
+ return compareValues(when, o.when, true) && compareValues(contentType, o.contentType, true) && compareValues(blob, o.blob, true)
+ ;
}
public boolean isEmpty() {
return super.isEmpty() && (type == null || type.isEmpty()) && (when == null || when.isEmpty())
- && (who == null || who.isEmpty()) && (blob == null || blob.isEmpty());
+ && (who == null || who.isEmpty()) && (contentType == null || contentType.isEmpty()) && (blob == null || blob.isEmpty())
+ ;
}
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java
index bb792283ca3..c4b26285465 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java
index da699cd377e..249babe12b1 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java
index f025d64a1b5..dd72e317fd3 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -47,102 +47,74 @@ import org.hl7.fhir.instance.model.api.*;
@ResourceDef(name="StructureDefinition", profile="http://hl7.org/fhir/Profile/StructureDefinition")
public class StructureDefinition extends DomainResource {
- public enum StructureDefinitionType {
+ public enum StructureDefinitionKind {
/**
* A data type - either a primitive or complex structure that defines a set of data elements. These can be used throughout Resource and extension definitions
*/
- TYPE,
+ DATATYPE,
/**
* A resource defined by the FHIR specification
*/
RESOURCE,
- /**
- * A set of constraints on a resource or data type that describe how it is used for a particular use
- */
- CONSTRAINT,
- /**
- * A definition of an extension that can be used in a FHIR resource (or a set of constraints on an exsting extension)
- */
- EXTENSION,
/**
* added to help the parsers
*/
NULL;
- public static StructureDefinitionType fromCode(String codeString) throws Exception {
+ public static StructureDefinitionKind fromCode(String codeString) throws Exception {
if (codeString == null || "".equals(codeString))
return null;
- if ("type".equals(codeString))
- return TYPE;
+ if ("datatype".equals(codeString))
+ return DATATYPE;
if ("resource".equals(codeString))
return RESOURCE;
- if ("constraint".equals(codeString))
- return CONSTRAINT;
- if ("extension".equals(codeString))
- return EXTENSION;
- throw new Exception("Unknown StructureDefinitionType code '"+codeString+"'");
+ throw new Exception("Unknown StructureDefinitionKind code '"+codeString+"'");
}
public String toCode() {
switch (this) {
- case TYPE: return "type";
+ case DATATYPE: return "datatype";
case RESOURCE: return "resource";
- case CONSTRAINT: return "constraint";
- case EXTENSION: return "extension";
default: return "?";
}
}
public String getSystem() {
switch (this) {
- case TYPE: return "http://hl7.org/fhir/structure-definition-type";
- case RESOURCE: return "http://hl7.org/fhir/structure-definition-type";
- case CONSTRAINT: return "http://hl7.org/fhir/structure-definition-type";
- case EXTENSION: return "http://hl7.org/fhir/structure-definition-type";
+ case DATATYPE: return "http://hl7.org/fhir/structure-definition-kind";
+ case RESOURCE: return "http://hl7.org/fhir/structure-definition-kind";
default: return "?";
}
}
public String getDefinition() {
switch (this) {
- case TYPE: return "A data type - either a primitive or complex structure that defines a set of data elements. These can be used throughout Resource and extension definitions";
+ case DATATYPE: return "A data type - either a primitive or complex structure that defines a set of data elements. These can be used throughout Resource and extension definitions";
case RESOURCE: return "A resource defined by the FHIR specification";
- case CONSTRAINT: return "A set of constraints on a resource or data type that describe how it is used for a particular use";
- case EXTENSION: return "A definition of an extension that can be used in a FHIR resource (or a set of constraints on an exsting extension)";
default: return "?";
}
}
public String getDisplay() {
switch (this) {
- case TYPE: return "Data Type";
+ case DATATYPE: return "Data Type";
case RESOURCE: return "Resource";
- case CONSTRAINT: return "Constrained Type";
- case EXTENSION: return "Extension Definition";
default: return "?";
}
}
}
- public static class StructureDefinitionTypeEnumFactory implements EnumFactory {
- public StructureDefinitionType fromCode(String codeString) throws IllegalArgumentException {
+ public static class StructureDefinitionKindEnumFactory implements EnumFactory {
+ public StructureDefinitionKind fromCode(String codeString) throws IllegalArgumentException {
if (codeString == null || "".equals(codeString))
if (codeString == null || "".equals(codeString))
return null;
- if ("type".equals(codeString))
- return StructureDefinitionType.TYPE;
+ if ("datatype".equals(codeString))
+ return StructureDefinitionKind.DATATYPE;
if ("resource".equals(codeString))
- return StructureDefinitionType.RESOURCE;
- if ("constraint".equals(codeString))
- return StructureDefinitionType.CONSTRAINT;
- if ("extension".equals(codeString))
- return StructureDefinitionType.EXTENSION;
- throw new IllegalArgumentException("Unknown StructureDefinitionType code '"+codeString+"'");
+ return StructureDefinitionKind.RESOURCE;
+ throw new IllegalArgumentException("Unknown StructureDefinitionKind code '"+codeString+"'");
}
- public String toCode(StructureDefinitionType code) {
- if (code == StructureDefinitionType.TYPE)
- return "type";
- if (code == StructureDefinitionType.RESOURCE)
+ public String toCode(StructureDefinitionKind code) {
+ if (code == StructureDefinitionKind.DATATYPE)
+ return "datatype";
+ if (code == StructureDefinitionKind.RESOURCE)
return "resource";
- if (code == StructureDefinitionType.CONSTRAINT)
- return "constraint";
- if (code == StructureDefinitionType.EXTENSION)
- return "extension";
return "?";
}
}
@@ -1012,55 +984,62 @@ public class StructureDefinition extends DomainResource {
protected List mapping;
/**
- * Defines the type of structure that this definition is describing.
+ * Defines the kind of structure that this definition is describing.
*/
- @Child(name = "type", type = {CodeType.class}, order=17, min=1, max=1)
- @Description(shortDefinition="type | resource | constraint | extension", formalDefinition="Defines the type of structure that this definition is describing." )
- protected Enumeration type;
+ @Child(name = "kind", type = {CodeType.class}, order=17, min=1, max=1)
+ @Description(shortDefinition="datatype | resource", formalDefinition="Defines the kind of structure that this definition is describing." )
+ protected Enumeration kind;
+
+ /**
+ * The type of type that is being constrained - a data type, a resource, including abstract ones. If this field is present, it indicates that the structure definition is a constraint. If it is not present, then the structure definition is the definition of a base structure.
+ */
+ @Child(name = "constrainedType", type = {CodeType.class}, order=18, min=0, max=1)
+ @Description(shortDefinition="Any datatype or resource, including abstract ones", formalDefinition="The type of type that is being constrained - a data type, a resource, including abstract ones. If this field is present, it indicates that the structure definition is a constraint. If it is not present, then the structure definition is the definition of a base structure." )
+ protected CodeType constrainedType;
/**
* Whether structure this definition describes is abstract or not - that is, whether an actual exchanged item can ever be of this type.
*/
- @Child(name = "abstract", type = {BooleanType.class}, order=18, min=1, max=1)
+ @Child(name = "abstract", type = {BooleanType.class}, order=19, min=1, max=1)
@Description(shortDefinition="Whether the structure is abstract", formalDefinition="Whether structure this definition describes is abstract or not - that is, whether an actual exchanged item can ever be of this type." )
protected BooleanType abstract_;
/**
* If this is an extension, Identifies the context within FHIR resources where the extension can be used.
*/
- @Child(name = "contextType", type = {CodeType.class}, order=19, min=0, max=1)
+ @Child(name = "contextType", type = {CodeType.class}, order=20, min=0, max=1)
@Description(shortDefinition="resource | datatype | mapping | extension", formalDefinition="If this is an extension, Identifies the context within FHIR resources where the extension can be used." )
protected Enumeration contextType;
/**
* Identifies the types of resource or data type elements to which the extension can be applied.
*/
- @Child(name = "context", type = {StringType.class}, order=20, min=0, max=Child.MAX_UNLIMITED)
+ @Child(name = "context", type = {StringType.class}, order=21, min=0, max=Child.MAX_UNLIMITED)
@Description(shortDefinition="Where the extension can be used in instances", formalDefinition="Identifies the types of resource or data type elements to which the extension can be applied." )
protected List context;
/**
* An absolute URI that is the base structure from which this set of constraints is derived.
*/
- @Child(name = "base", type = {UriType.class}, order=21, min=0, max=1)
+ @Child(name = "base", type = {UriType.class}, order=22, min=0, max=1)
@Description(shortDefinition="Structure that this set of constraints applies to", formalDefinition="An absolute URI that is the base structure from which this set of constraints is derived." )
protected UriType base;
/**
* A snapshot view is expressed in a stand alone form that can be used and interpreted without considering the base StructureDefinition.
*/
- @Child(name = "snapshot", type = {}, order=22, min=0, max=1)
+ @Child(name = "snapshot", type = {}, order=23, min=0, max=1)
@Description(shortDefinition="Snapshot view of the structure", formalDefinition="A snapshot view is expressed in a stand alone form that can be used and interpreted without considering the base StructureDefinition." )
protected StructureDefinitionSnapshotComponent snapshot;
/**
* A differential view is expressed relative to the base StructureDefinition - a statement of differences that it applies.
*/
- @Child(name = "differential", type = {}, order=23, min=0, max=1)
+ @Child(name = "differential", type = {}, order=24, min=0, max=1)
@Description(shortDefinition="Differential view of the structure", formalDefinition="A differential view is expressed relative to the base StructureDefinition - a statement of differences that it applies." )
protected StructureDefinitionDifferentialComponent differential;
- private static final long serialVersionUID = -1935809660L;
+ private static final long serialVersionUID = 1077176351L;
/*
* Constructor
@@ -1072,12 +1051,12 @@ public class StructureDefinition extends DomainResource {
/*
* Constructor
*/
- public StructureDefinition(UriType url, StringType name, Enumeration status, Enumeration type, BooleanType abstract_) {
+ public StructureDefinition(UriType url, StringType name, Enumeration status, Enumeration kind, BooleanType abstract_) {
super();
this.url = url;
this.name = name;
this.status = status;
- this.type = type;
+ this.kind = kind;
this.abstract_ = abstract_;
}
@@ -1854,47 +1833,96 @@ public class StructureDefinition extends DomainResource {
}
/**
- * @return {@link #type} (Defines the type of structure that this definition is describing.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+ * @return {@link #kind} (Defines the kind of structure that this definition is describing.). This is the underlying object with id, value and extensions. The accessor "getKind" gives direct access to the value
*/
- public Enumeration getTypeElement() {
- if (this.type == null)
+ public Enumeration getKindElement() {
+ if (this.kind == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create StructureDefinition.type");
+ throw new Error("Attempt to auto-create StructureDefinition.kind");
else if (Configuration.doAutoCreate())
- this.type = new Enumeration(new StructureDefinitionTypeEnumFactory()); // bb
- return this.type;
+ this.kind = new Enumeration(new StructureDefinitionKindEnumFactory()); // bb
+ return this.kind;
}
- public boolean hasTypeElement() {
- return this.type != null && !this.type.isEmpty();
+ public boolean hasKindElement() {
+ return this.kind != null && !this.kind.isEmpty();
}
- public boolean hasType() {
- return this.type != null && !this.type.isEmpty();
+ public boolean hasKind() {
+ return this.kind != null && !this.kind.isEmpty();
}
/**
- * @param value {@link #type} (Defines the type of structure that this definition is describing.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+ * @param value {@link #kind} (Defines the kind of structure that this definition is describing.). This is the underlying object with id, value and extensions. The accessor "getKind" gives direct access to the value
*/
- public StructureDefinition setTypeElement(Enumeration value) {
- this.type = value;
+ public StructureDefinition setKindElement(Enumeration value) {
+ this.kind = value;
return this;
}
/**
- * @return Defines the type of structure that this definition is describing.
+ * @return Defines the kind of structure that this definition is describing.
*/
- public StructureDefinitionType getType() {
- return this.type == null ? null : this.type.getValue();
+ public StructureDefinitionKind getKind() {
+ return this.kind == null ? null : this.kind.getValue();
}
/**
- * @param value Defines the type of structure that this definition is describing.
+ * @param value Defines the kind of structure that this definition is describing.
*/
- public StructureDefinition setType(StructureDefinitionType value) {
- if (this.type == null)
- this.type = new Enumeration(new StructureDefinitionTypeEnumFactory());
- this.type.setValue(value);
+ public StructureDefinition setKind(StructureDefinitionKind value) {
+ if (this.kind == null)
+ this.kind = new Enumeration(new StructureDefinitionKindEnumFactory());
+ this.kind.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #constrainedType} (The type of type that is being constrained - a data type, a resource, including abstract ones. If this field is present, it indicates that the structure definition is a constraint. If it is not present, then the structure definition is the definition of a base structure.). This is the underlying object with id, value and extensions. The accessor "getConstrainedType" gives direct access to the value
+ */
+ public CodeType getConstrainedTypeElement() {
+ if (this.constrainedType == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create StructureDefinition.constrainedType");
+ else if (Configuration.doAutoCreate())
+ this.constrainedType = new CodeType(); // bb
+ return this.constrainedType;
+ }
+
+ public boolean hasConstrainedTypeElement() {
+ return this.constrainedType != null && !this.constrainedType.isEmpty();
+ }
+
+ public boolean hasConstrainedType() {
+ return this.constrainedType != null && !this.constrainedType.isEmpty();
+ }
+
+ /**
+ * @param value {@link #constrainedType} (The type of type that is being constrained - a data type, a resource, including abstract ones. If this field is present, it indicates that the structure definition is a constraint. If it is not present, then the structure definition is the definition of a base structure.). This is the underlying object with id, value and extensions. The accessor "getConstrainedType" gives direct access to the value
+ */
+ public StructureDefinition setConstrainedTypeElement(CodeType value) {
+ this.constrainedType = value;
+ return this;
+ }
+
+ /**
+ * @return The type of type that is being constrained - a data type, a resource, including abstract ones. If this field is present, it indicates that the structure definition is a constraint. If it is not present, then the structure definition is the definition of a base structure.
+ */
+ public String getConstrainedType() {
+ return this.constrainedType == null ? null : this.constrainedType.getValue();
+ }
+
+ /**
+ * @param value The type of type that is being constrained - a data type, a resource, including abstract ones. If this field is present, it indicates that the structure definition is a constraint. If it is not present, then the structure definition is the definition of a base structure.
+ */
+ public StructureDefinition setConstrainedType(String value) {
+ if (Utilities.noString(value))
+ this.constrainedType = null;
+ else {
+ if (this.constrainedType == null)
+ this.constrainedType = new CodeType();
+ this.constrainedType.setValue(value);
+ }
return this;
}
@@ -2162,7 +2190,8 @@ public class StructureDefinition extends DomainResource {
childrenList.add(new Property("date", "dateTime", "The date that this version of the StructureDefinition was published.", 0, java.lang.Integer.MAX_VALUE, date));
childrenList.add(new Property("fhirVersion", "id", "The version of the FHIR specification on which this StructureDefinition is based - this is the formal version of the specification, without the revision number, e.g. [publication].[major].[minor], which is 0.5.0 for this version.", 0, java.lang.Integer.MAX_VALUE, fhirVersion));
childrenList.add(new Property("mapping", "", "An external specification that the content is mapped to.", 0, java.lang.Integer.MAX_VALUE, mapping));
- childrenList.add(new Property("type", "code", "Defines the type of structure that this definition is describing.", 0, java.lang.Integer.MAX_VALUE, type));
+ childrenList.add(new Property("kind", "code", "Defines the kind of structure that this definition is describing.", 0, java.lang.Integer.MAX_VALUE, kind));
+ childrenList.add(new Property("constrainedType", "code", "The type of type that is being constrained - a data type, a resource, including abstract ones. If this field is present, it indicates that the structure definition is a constraint. If it is not present, then the structure definition is the definition of a base structure.", 0, java.lang.Integer.MAX_VALUE, constrainedType));
childrenList.add(new Property("abstract", "boolean", "Whether structure this definition describes is abstract or not - that is, whether an actual exchanged item can ever be of this type.", 0, java.lang.Integer.MAX_VALUE, abstract_));
childrenList.add(new Property("contextType", "code", "If this is an extension, Identifies the context within FHIR resources where the extension can be used.", 0, java.lang.Integer.MAX_VALUE, contextType));
childrenList.add(new Property("context", "string", "Identifies the types of resource or data type elements to which the extension can be applied.", 0, java.lang.Integer.MAX_VALUE, context));
@@ -2211,7 +2240,8 @@ public class StructureDefinition extends DomainResource {
for (StructureDefinitionMappingComponent i : mapping)
dst.mapping.add(i.copy());
};
- dst.type = type == null ? null : type.copy();
+ dst.kind = kind == null ? null : kind.copy();
+ dst.constrainedType = constrainedType == null ? null : constrainedType.copy();
dst.abstract_ = abstract_ == null ? null : abstract_.copy();
dst.contextType = contextType == null ? null : contextType.copy();
if (context != null) {
@@ -2242,9 +2272,9 @@ public class StructureDefinition extends DomainResource {
&& compareDeep(requirements, o.requirements, true) && compareDeep(copyright, o.copyright, true)
&& compareDeep(code, o.code, true) && compareDeep(status, o.status, true) && compareDeep(experimental, o.experimental, true)
&& compareDeep(date, o.date, true) && compareDeep(fhirVersion, o.fhirVersion, true) && compareDeep(mapping, o.mapping, true)
- && compareDeep(type, o.type, true) && compareDeep(abstract_, o.abstract_, true) && compareDeep(contextType, o.contextType, true)
- && compareDeep(context, o.context, true) && compareDeep(base, o.base, true) && compareDeep(snapshot, o.snapshot, true)
- && compareDeep(differential, o.differential, true);
+ && compareDeep(kind, o.kind, true) && compareDeep(constrainedType, o.constrainedType, true) && compareDeep(abstract_, o.abstract_, true)
+ && compareDeep(contextType, o.contextType, true) && compareDeep(context, o.context, true) && compareDeep(base, o.base, true)
+ && compareDeep(snapshot, o.snapshot, true) && compareDeep(differential, o.differential, true);
}
@Override
@@ -2258,9 +2288,9 @@ public class StructureDefinition extends DomainResource {
&& compareValues(display, o.display, true) && compareValues(publisher, o.publisher, true) && compareValues(description, o.description, true)
&& compareValues(requirements, o.requirements, true) && compareValues(copyright, o.copyright, true)
&& compareValues(status, o.status, true) && compareValues(experimental, o.experimental, true) && compareValues(date, o.date, true)
- && compareValues(fhirVersion, o.fhirVersion, true) && compareValues(type, o.type, true) && compareValues(abstract_, o.abstract_, true)
- && compareValues(contextType, o.contextType, true) && compareValues(context, o.context, true) && compareValues(base, o.base, true)
- ;
+ && compareValues(fhirVersion, o.fhirVersion, true) && compareValues(kind, o.kind, true) && compareValues(constrainedType, o.constrainedType, true)
+ && compareValues(abstract_, o.abstract_, true) && compareValues(contextType, o.contextType, true) && compareValues(context, o.context, true)
+ && compareValues(base, o.base, true);
}
public boolean isEmpty() {
@@ -2270,10 +2300,10 @@ public class StructureDefinition extends DomainResource {
&& (description == null || description.isEmpty()) && (requirements == null || requirements.isEmpty())
&& (copyright == null || copyright.isEmpty()) && (code == null || code.isEmpty()) && (status == null || status.isEmpty())
&& (experimental == null || experimental.isEmpty()) && (date == null || date.isEmpty()) && (fhirVersion == null || fhirVersion.isEmpty())
- && (mapping == null || mapping.isEmpty()) && (type == null || type.isEmpty()) && (abstract_ == null || abstract_.isEmpty())
- && (contextType == null || contextType.isEmpty()) && (context == null || context.isEmpty())
- && (base == null || base.isEmpty()) && (snapshot == null || snapshot.isEmpty()) && (differential == null || differential.isEmpty())
- ;
+ && (mapping == null || mapping.isEmpty()) && (kind == null || kind.isEmpty()) && (constrainedType == null || constrainedType.isEmpty())
+ && (abstract_ == null || abstract_.isEmpty()) && (contextType == null || contextType.isEmpty())
+ && (context == null || context.isEmpty()) && (base == null || base.isEmpty()) && (snapshot == null || snapshot.isEmpty())
+ && (differential == null || differential.isEmpty());
}
@Override
@@ -2289,6 +2319,8 @@ public class StructureDefinition extends DomainResource {
public static final String SP_CODE = "code";
@SearchParamDefinition(name="valueset", path="StructureDefinition.snapshot.element.binding.valueSet[x]", description="A vocabulary binding reference", type="reference" )
public static final String SP_VALUESET = "valueset";
+ @SearchParamDefinition(name="kind", path="StructureDefinition.kind", description="datatype | resource", type="token" )
+ public static final String SP_KIND = "kind";
@SearchParamDefinition(name="display", path="StructureDefinition.display", description="Use this name when displaying the value", type="string" )
public static final String SP_DISPLAY = "display";
@SearchParamDefinition(name="description", path="StructureDefinition.description", description="Text search in the description of the profile", type="string" )
@@ -2299,7 +2331,7 @@ public class StructureDefinition extends DomainResource {
public static final String SP_CONTEXTTYPE = "context-type";
@SearchParamDefinition(name="abstract", path="StructureDefinition.abstract", description="Whether the structure is abstract", type="token" )
public static final String SP_ABSTRACT = "abstract";
- @SearchParamDefinition(name="type", path="StructureDefinition.type", description="type | resource | constraint | extension", type="token" )
+ @SearchParamDefinition(name="type", path="StructureDefinition.constrainedType", description="Any datatype or resource, including abstract ones", type="token" )
public static final String SP_TYPE = "type";
@SearchParamDefinition(name="version", path="StructureDefinition.version", description="The version identifier of the profile", type="token" )
public static final String SP_VERSION = "version";
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java
index d21f33970b8..49ed165fa26 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java
index 250e343f5c8..95689114efe 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Supply.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Supply.java
index c29c893b754..4af35fab74b 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Supply.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Supply.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -98,11 +98,11 @@ public class Supply extends DomainResource {
}
public String getSystem() {
switch (this) {
- case REQUESTED: return "http://hl7.org/fhir/valueset-supply-status";
- case DISPENSED: return "http://hl7.org/fhir/valueset-supply-status";
- case RECEIVED: return "http://hl7.org/fhir/valueset-supply-status";
- case FAILED: return "http://hl7.org/fhir/valueset-supply-status";
- case CANCELLED: return "http://hl7.org/fhir/valueset-supply-status";
+ case REQUESTED: return "http://hl7.org/fhir/supply-status";
+ case DISPENSED: return "http://hl7.org/fhir/supply-status";
+ case RECEIVED: return "http://hl7.org/fhir/supply-status";
+ case FAILED: return "http://hl7.org/fhir/supply-status";
+ case CANCELLED: return "http://hl7.org/fhir/supply-status";
default: return "?";
}
}
@@ -198,9 +198,9 @@ public class Supply extends DomainResource {
}
public String getSystem() {
switch (this) {
- case INPROGRESS: return "http://hl7.org/fhir/valueset-supply-dispense-status";
- case DISPENSED: return "http://hl7.org/fhir/valueset-supply-dispense-status";
- case ABANDONED: return "http://hl7.org/fhir/valueset-supply-dispense-status";
+ case INPROGRESS: return "http://hl7.org/fhir/supply-dispense-status";
+ case DISPENSED: return "http://hl7.org/fhir/supply-dispense-status";
+ case ABANDONED: return "http://hl7.org/fhir/supply-dispense-status";
default: return "?";
}
}
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java
index 36ad3aa10fb..86f6ecb7e7b 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -84,9 +84,9 @@ public class SupplyDelivery extends DomainResource {
}
public String getSystem() {
switch (this) {
- case INPROGRESS: return "http://hl7.org/fhir/valueset-supplydelivery-status";
- case COMPLETED: return "http://hl7.org/fhir/valueset-supplydelivery-status";
- case ABANDONED: return "http://hl7.org/fhir/valueset-supplydelivery-status";
+ case INPROGRESS: return "http://hl7.org/fhir/supplydelivery-status";
+ case COMPLETED: return "http://hl7.org/fhir/supplydelivery-status";
+ case ABANDONED: return "http://hl7.org/fhir/supplydelivery-status";
default: return "?";
}
}
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java
index 1dc4183aeb5..d2ae59337b5 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -91,10 +91,10 @@ public class SupplyRequest extends DomainResource {
}
public String getSystem() {
switch (this) {
- case REQUESTED: return "http://hl7.org/fhir/valueset-supplyrequest-status";
- case COMPLETED: return "http://hl7.org/fhir/valueset-supplyrequest-status";
- case FAILED: return "http://hl7.org/fhir/valueset-supplyrequest-status";
- case CANCELLED: return "http://hl7.org/fhir/valueset-supplyrequest-status";
+ case REQUESTED: return "http://hl7.org/fhir/supplyrequest-status";
+ case COMPLETED: return "http://hl7.org/fhir/supplyrequest-status";
+ case FAILED: return "http://hl7.org/fhir/supplyrequest-status";
+ case CANCELLED: return "http://hl7.org/fhir/supplyrequest-status";
default: return "?";
}
}
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java
index 44d09caec1c..8f41599503b 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java
@@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model;
*/
-// Generated on Wed, Jul 8, 2015 17:35-0400 for FHIR v0.5.0
+// Generated on Tue, Jul 14, 2015 17:35-0400 for FHIR v0.5.0
import java.util.*;
@@ -96,18 +96,6 @@ public class TestScript extends DomainResource {
* Not currently supported test operation.
*/
DOCUMENT,
- /**
- * Make an assertion against the result of the last non-assertion operation.
- */
- ASSERTION,
- /**
- * Make a negative or false assertion against the result of the last non-assertion operation.
- */
- ASSERTIONFALSE,
- /**
- * Run an assertion function as a warning (instead of a failture) against the result of the last non-assertion operation.
- */
- ASSERTIONWARNING,
/**
* added to help the parsers
*/
@@ -139,12 +127,6 @@ public class TestScript extends DomainResource {
return MAILBOX;
if ("document".equals(codeString))
return DOCUMENT;
- if ("assertion".equals(codeString))
- return ASSERTION;
- if ("assertion_false".equals(codeString))
- return ASSERTIONFALSE;
- if ("assertion_warning".equals(codeString))
- return ASSERTIONWARNING;
throw new Exception("Unknown TestOperationType code '"+codeString+"'");
}
public String toCode() {
@@ -161,9 +143,6 @@ public class TestScript extends DomainResource {
case TAGS: return "tags";
case MAILBOX: return "mailbox";
case DOCUMENT: return "document";
- case ASSERTION: return "assertion";
- case ASSERTIONFALSE: return "assertion_false";
- case ASSERTIONWARNING: return "assertion_warning";
default: return "?";
}
}
@@ -181,9 +160,6 @@ public class TestScript extends DomainResource {
case TAGS: return "http://hl7.org/fhir/test-operation-codes";
case MAILBOX: return "http://hl7.org/fhir/test-operation-codes";
case DOCUMENT: return "http://hl7.org/fhir/test-operation-codes";
- case ASSERTION: return "http://hl7.org/fhir/test-operation-codes";
- case ASSERTIONFALSE: return "http://hl7.org/fhir/test-operation-codes";
- case ASSERTIONWARNING: return "http://hl7.org/fhir/test-operation-codes";
default: return "?";
}
}
@@ -201,9 +177,6 @@ public class TestScript extends DomainResource {
case TAGS: return "Tag operations.";
case MAILBOX: return "Not currently supported test operation.";
case DOCUMENT: return "Not currently supported test operation.";
- case ASSERTION: return "Make an assertion against the result of the last non-assertion operation.";
- case ASSERTIONFALSE: return "Make a negative or false assertion against the result of the last non-assertion operation.";
- case ASSERTIONWARNING: return "Run an assertion function as a warning (instead of a failture) against the result of the last non-assertion operation.";
default: return "?";
}
}
@@ -221,9 +194,6 @@ public class TestScript extends DomainResource {
case TAGS: return "tags";
case MAILBOX: return "mailbox";
case DOCUMENT: return "document";
- case ASSERTION: return "assertion";
- case ASSERTIONFALSE: return "assertion_false";
- case ASSERTIONWARNING: return "assertion_warning";
default: return "?";
}
}
@@ -258,12 +228,6 @@ public class TestScript extends DomainResource {
return TestOperationType.MAILBOX;
if ("document".equals(codeString))
return TestOperationType.DOCUMENT;
- if ("assertion".equals(codeString))
- return TestOperationType.ASSERTION;
- if ("assertion_false".equals(codeString))
- return TestOperationType.ASSERTIONFALSE;
- if ("assertion_warning".equals(codeString))
- return TestOperationType.ASSERTIONWARNING;
throw new IllegalArgumentException("Unknown TestOperationType code '"+codeString+"'");
}
public String toCode(TestOperationType code) {
@@ -291,12 +255,6 @@ public class TestScript extends DomainResource {
return "mailbox";
if (code == TestOperationType.DOCUMENT)
return "document";
- if (code == TestOperationType.ASSERTION)
- return "assertion";
- if (code == TestOperationType.ASSERTIONFALSE)
- return "assertion_false";
- if (code == TestOperationType.ASSERTIONWARNING)
- return "assertion_warning";
return "?";
}
}
@@ -373,37 +331,1153 @@ public class TestScript extends DomainResource {
}
}
+ public enum AssertionOperatorType {
+ /**
+ * Default value. Equals comparison.
+ */
+ EQUALS,
+ /**
+ * Not equals comparison.
+ */
+ NOTEQUALS,
+ /**
+ * Compare value within a known set of values.
+ */
+ IN,
+ /**
+ * Compare value not within a known set of values.
+ */
+ NOTIN,
+ /**
+ * Compare value to be greater than a known value.
+ */
+ GREATERTHAN,
+ /**
+ * Compare value to be less than a known value.
+ */
+ LESSTHAN,
+ /**
+ * Compare value is empty.
+ */
+ EMPTY,
+ /**
+ * Compare value is not empty.
+ */
+ NOTEMPTY,
+ /**
+ * Compare value string contains a known value.
+ */
+ CONTAINS,
+ /**
+ * Compare value string does not contain a known value.
+ */
+ NOTCONTAINS,
+ /**
+ * added to help the parsers
+ */
+ NULL;
+ public static AssertionOperatorType fromCode(String codeString) throws Exception {
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("equals".equals(codeString))
+ return EQUALS;
+ if ("notEquals".equals(codeString))
+ return NOTEQUALS;
+ if ("in".equals(codeString))
+ return IN;
+ if ("notIn".equals(codeString))
+ return NOTIN;
+ if ("greaterThan".equals(codeString))
+ return GREATERTHAN;
+ if ("lessThan".equals(codeString))
+ return LESSTHAN;
+ if ("empty".equals(codeString))
+ return EMPTY;
+ if ("notEmpty".equals(codeString))
+ return NOTEMPTY;
+ if ("contains".equals(codeString))
+ return CONTAINS;
+ if ("notContains".equals(codeString))
+ return NOTCONTAINS;
+ throw new Exception("Unknown AssertionOperatorType code '"+codeString+"'");
+ }
+ public String toCode() {
+ switch (this) {
+ case EQUALS: return "equals";
+ case NOTEQUALS: return "notEquals";
+ case IN: return "in";
+ case NOTIN: return "notIn";
+ case GREATERTHAN: return "greaterThan";
+ case LESSTHAN: return "lessThan";
+ case EMPTY: return "empty";
+ case NOTEMPTY: return "notEmpty";
+ case CONTAINS: return "contains";
+ case NOTCONTAINS: return "notContains";
+ default: return "?";
+ }
+ }
+ public String getSystem() {
+ switch (this) {
+ case EQUALS: return "http://hl7.org/fhir/assert-operator-codes";
+ case NOTEQUALS: return "http://hl7.org/fhir/assert-operator-codes";
+ case IN: return "http://hl7.org/fhir/assert-operator-codes";
+ case NOTIN: return "http://hl7.org/fhir/assert-operator-codes";
+ case GREATERTHAN: return "http://hl7.org/fhir/assert-operator-codes";
+ case LESSTHAN: return "http://hl7.org/fhir/assert-operator-codes";
+ case EMPTY: return "http://hl7.org/fhir/assert-operator-codes";
+ case NOTEMPTY: return "http://hl7.org/fhir/assert-operator-codes";
+ case CONTAINS: return "http://hl7.org/fhir/assert-operator-codes";
+ case NOTCONTAINS: return "http://hl7.org/fhir/assert-operator-codes";
+ default: return "?";
+ }
+ }
+ public String getDefinition() {
+ switch (this) {
+ case EQUALS: return "Default value. Equals comparison.";
+ case NOTEQUALS: return "Not equals comparison.";
+ case IN: return "Compare value within a known set of values.";
+ case NOTIN: return "Compare value not within a known set of values.";
+ case GREATERTHAN: return "Compare value to be greater than a known value.";
+ case LESSTHAN: return "Compare value to be less than a known value.";
+ case EMPTY: return "Compare value is empty.";
+ case NOTEMPTY: return "Compare value is not empty.";
+ case CONTAINS: return "Compare value string contains a known value.";
+ case NOTCONTAINS: return "Compare value string does not contain a known value.";
+ default: return "?";
+ }
+ }
+ public String getDisplay() {
+ switch (this) {
+ case EQUALS: return "equals";
+ case NOTEQUALS: return "notEquals";
+ case IN: return "in";
+ case NOTIN: return "notIn";
+ case GREATERTHAN: return "greaterThan";
+ case LESSTHAN: return "lessThan";
+ case EMPTY: return "empty";
+ case NOTEMPTY: return "notEmpty";
+ case CONTAINS: return "contains";
+ case NOTCONTAINS: return "notContains";
+ default: return "?";
+ }
+ }
+ }
+
+ public static class AssertionOperatorTypeEnumFactory implements EnumFactory {
+ public AssertionOperatorType fromCode(String codeString) throws IllegalArgumentException {
+ if (codeString == null || "".equals(codeString))
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("equals".equals(codeString))
+ return AssertionOperatorType.EQUALS;
+ if ("notEquals".equals(codeString))
+ return AssertionOperatorType.NOTEQUALS;
+ if ("in".equals(codeString))
+ return AssertionOperatorType.IN;
+ if ("notIn".equals(codeString))
+ return AssertionOperatorType.NOTIN;
+ if ("greaterThan".equals(codeString))
+ return AssertionOperatorType.GREATERTHAN;
+ if ("lessThan".equals(codeString))
+ return AssertionOperatorType.LESSTHAN;
+ if ("empty".equals(codeString))
+ return AssertionOperatorType.EMPTY;
+ if ("notEmpty".equals(codeString))
+ return AssertionOperatorType.NOTEMPTY;
+ if ("contains".equals(codeString))
+ return AssertionOperatorType.CONTAINS;
+ if ("notContains".equals(codeString))
+ return AssertionOperatorType.NOTCONTAINS;
+ throw new IllegalArgumentException("Unknown AssertionOperatorType code '"+codeString+"'");
+ }
+ public String toCode(AssertionOperatorType code) {
+ if (code == AssertionOperatorType.EQUALS)
+ return "equals";
+ if (code == AssertionOperatorType.NOTEQUALS)
+ return "notEquals";
+ if (code == AssertionOperatorType.IN)
+ return "in";
+ if (code == AssertionOperatorType.NOTIN)
+ return "notIn";
+ if (code == AssertionOperatorType.GREATERTHAN)
+ return "greaterThan";
+ if (code == AssertionOperatorType.LESSTHAN)
+ return "lessThan";
+ if (code == AssertionOperatorType.EMPTY)
+ return "empty";
+ if (code == AssertionOperatorType.NOTEMPTY)
+ return "notEmpty";
+ if (code == AssertionOperatorType.CONTAINS)
+ return "contains";
+ if (code == AssertionOperatorType.NOTCONTAINS)
+ return "notContains";
+ return "?";
+ }
+ }
+
+ public enum AssertionResponseTypes {
+ /**
+ * Response code is 200.
+ */
+ OKAY,
+ /**
+ * Response code is 201.
+ */
+ CREATED,
+ /**
+ * Response code is 204.
+ */
+ NOCONTENT,
+ /**
+ * Response code is 304.
+ */
+ NOTMODIFIED,
+ /**
+ * Response code is 400.
+ */
+ BAD,
+ /**
+ * Response code is 403.
+ */
+ FORBIDDEN,
+ /**
+ * Response code is 404.
+ */
+ NOTFOUND,
+ /**
+ * Response code is 405.
+ */
+ METHODNOTALLOWED,
+ /**
+ * Response code is 409.
+ */
+ CONFLICT,
+ /**
+ * Response code is 410.
+ */
+ GONE,
+ /**
+ * Response code is 412.
+ */
+ PRECONDITIONFAILED,
+ /**
+ * Response code is 422.
+ */
+ UNPROCESSABLE,
+ /**
+ * added to help the parsers
+ */
+ NULL;
+ public static AssertionResponseTypes fromCode(String codeString) throws Exception {
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("okay".equals(codeString))
+ return OKAY;
+ if ("created".equals(codeString))
+ return CREATED;
+ if ("noContent".equals(codeString))
+ return NOCONTENT;
+ if ("notModified".equals(codeString))
+ return NOTMODIFIED;
+ if ("bad".equals(codeString))
+ return BAD;
+ if ("forbidden".equals(codeString))
+ return FORBIDDEN;
+ if ("notFound".equals(codeString))
+ return NOTFOUND;
+ if ("methodNotAllowed".equals(codeString))
+ return METHODNOTALLOWED;
+ if ("conflict".equals(codeString))
+ return CONFLICT;
+ if ("gone".equals(codeString))
+ return GONE;
+ if ("preconditionFailed".equals(codeString))
+ return PRECONDITIONFAILED;
+ if ("unprocessable".equals(codeString))
+ return UNPROCESSABLE;
+ throw new Exception("Unknown AssertionResponseTypes code '"+codeString+"'");
+ }
+ public String toCode() {
+ switch (this) {
+ case OKAY: return "okay";
+ case CREATED: return "created";
+ case NOCONTENT: return "noContent";
+ case NOTMODIFIED: return "notModified";
+ case BAD: return "bad";
+ case FORBIDDEN: return "forbidden";
+ case NOTFOUND: return "notFound";
+ case METHODNOTALLOWED: return "methodNotAllowed";
+ case CONFLICT: return "conflict";
+ case GONE: return "gone";
+ case PRECONDITIONFAILED: return "preconditionFailed";
+ case UNPROCESSABLE: return "unprocessable";
+ default: return "?";
+ }
+ }
+ public String getSystem() {
+ switch (this) {
+ case OKAY: return "http://hl7.org/fhir/assert-response-code-types";
+ case CREATED: return "http://hl7.org/fhir/assert-response-code-types";
+ case NOCONTENT: return "http://hl7.org/fhir/assert-response-code-types";
+ case NOTMODIFIED: return "http://hl7.org/fhir/assert-response-code-types";
+ case BAD: return "http://hl7.org/fhir/assert-response-code-types";
+ case FORBIDDEN: return "http://hl7.org/fhir/assert-response-code-types";
+ case NOTFOUND: return "http://hl7.org/fhir/assert-response-code-types";
+ case METHODNOTALLOWED: return "http://hl7.org/fhir/assert-response-code-types";
+ case CONFLICT: return "http://hl7.org/fhir/assert-response-code-types";
+ case GONE: return "http://hl7.org/fhir/assert-response-code-types";
+ case PRECONDITIONFAILED: return "http://hl7.org/fhir/assert-response-code-types";
+ case UNPROCESSABLE: return "http://hl7.org/fhir/assert-response-code-types";
+ default: return "?";
+ }
+ }
+ public String getDefinition() {
+ switch (this) {
+ case OKAY: return "Response code is 200.";
+ case CREATED: return "Response code is 201.";
+ case NOCONTENT: return "Response code is 204.";
+ case NOTMODIFIED: return "Response code is 304.";
+ case BAD: return "Response code is 400.";
+ case FORBIDDEN: return "Response code is 403.";
+ case NOTFOUND: return "Response code is 404.";
+ case METHODNOTALLOWED: return "Response code is 405.";
+ case CONFLICT: return "Response code is 409.";
+ case GONE: return "Response code is 410.";
+ case PRECONDITIONFAILED: return "Response code is 412.";
+ case UNPROCESSABLE: return "Response code is 422.";
+ default: return "?";
+ }
+ }
+ public String getDisplay() {
+ switch (this) {
+ case OKAY: return "okay";
+ case CREATED: return "created";
+ case NOCONTENT: return "noContent";
+ case NOTMODIFIED: return "notModified";
+ case BAD: return "bad";
+ case FORBIDDEN: return "forbidden";
+ case NOTFOUND: return "notFound";
+ case METHODNOTALLOWED: return "methodNotAllowed";
+ case CONFLICT: return "conflict";
+ case GONE: return "gone";
+ case PRECONDITIONFAILED: return "preconditionFailed";
+ case UNPROCESSABLE: return "unprocessable";
+ default: return "?";
+ }
+ }
+ }
+
+ public static class AssertionResponseTypesEnumFactory implements EnumFactory {
+ public AssertionResponseTypes fromCode(String codeString) throws IllegalArgumentException {
+ if (codeString == null || "".equals(codeString))
+ if (codeString == null || "".equals(codeString))
+ return null;
+ if ("okay".equals(codeString))
+ return AssertionResponseTypes.OKAY;
+ if ("created".equals(codeString))
+ return AssertionResponseTypes.CREATED;
+ if ("noContent".equals(codeString))
+ return AssertionResponseTypes.NOCONTENT;
+ if ("notModified".equals(codeString))
+ return AssertionResponseTypes.NOTMODIFIED;
+ if ("bad".equals(codeString))
+ return AssertionResponseTypes.BAD;
+ if ("forbidden".equals(codeString))
+ return AssertionResponseTypes.FORBIDDEN;
+ if ("notFound".equals(codeString))
+ return AssertionResponseTypes.NOTFOUND;
+ if ("methodNotAllowed".equals(codeString))
+ return AssertionResponseTypes.METHODNOTALLOWED;
+ if ("conflict".equals(codeString))
+ return AssertionResponseTypes.CONFLICT;
+ if ("gone".equals(codeString))
+ return AssertionResponseTypes.GONE;
+ if ("preconditionFailed".equals(codeString))
+ return AssertionResponseTypes.PRECONDITIONFAILED;
+ if ("unprocessable".equals(codeString))
+ return AssertionResponseTypes.UNPROCESSABLE;
+ throw new IllegalArgumentException("Unknown AssertionResponseTypes code '"+codeString+"'");
+ }
+ public String toCode(AssertionResponseTypes code) {
+ if (code == AssertionResponseTypes.OKAY)
+ return "okay";
+ if (code == AssertionResponseTypes.CREATED)
+ return "created";
+ if (code == AssertionResponseTypes.NOCONTENT)
+ return "noContent";
+ if (code == AssertionResponseTypes.NOTMODIFIED)
+ return "notModified";
+ if (code == AssertionResponseTypes.BAD)
+ return "bad";
+ if (code == AssertionResponseTypes.FORBIDDEN)
+ return "forbidden";
+ if (code == AssertionResponseTypes.NOTFOUND)
+ return "notFound";
+ if (code == AssertionResponseTypes.METHODNOTALLOWED)
+ return "methodNotAllowed";
+ if (code == AssertionResponseTypes.CONFLICT)
+ return "conflict";
+ if (code == AssertionResponseTypes.GONE)
+ return "gone";
+ if (code == AssertionResponseTypes.PRECONDITIONFAILED)
+ return "preconditionFailed";
+ if (code == AssertionResponseTypes.UNPROCESSABLE)
+ return "unprocessable";
+ return "?";
+ }
+ }
+
+ @Block()
+ public static class TestScriptMetadataComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * A link to the FHIR specification that this test is covering.
+ */
+ @Child(name = "link", type = {}, order=1, min=0, max=Child.MAX_UNLIMITED)
+ @Description(shortDefinition="Links to the FHIR specification", formalDefinition="A link to the FHIR specification that this test is covering." )
+ protected List link;
+
+ /**
+ * Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.
+ */
+ @Child(name = "capabilities", type = {}, order=2, min=1, max=Child.MAX_UNLIMITED)
+ @Description(shortDefinition="Capabiltities that are assumed to function correctly on the FHIR server being tested", formalDefinition="Capabilties that must exist and is assumed to function correctly on the FHIR server being tested." )
+ protected List capabilities;
+
+ private static final long serialVersionUID = -419664800L;
+
+ /*
+ * Constructor
+ */
+ public TestScriptMetadataComponent() {
+ super();
+ }
+
+ /**
+ * @return {@link #link} (A link to the FHIR specification that this test is covering.)
+ */
+ public List getLink() {
+ if (this.link == null)
+ this.link = new ArrayList();
+ return this.link;
+ }
+
+ public boolean hasLink() {
+ if (this.link == null)
+ return false;
+ for (TestScriptMetadataLinkComponent item : this.link)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ /**
+ * @return {@link #link} (A link to the FHIR specification that this test is covering.)
+ */
+ // syntactic sugar
+ public TestScriptMetadataLinkComponent addLink() { //3
+ TestScriptMetadataLinkComponent t = new TestScriptMetadataLinkComponent();
+ if (this.link == null)
+ this.link = new ArrayList();
+ this.link.add(t);
+ return t;
+ }
+
+ // syntactic sugar
+ public TestScriptMetadataComponent addLink(TestScriptMetadataLinkComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.link == null)
+ this.link = new ArrayList();
+ this.link.add(t);
+ return this;
+ }
+
+ /**
+ * @return {@link #capabilities} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.)
+ */
+ public List getCapabilities() {
+ if (this.capabilities == null)
+ this.capabilities = new ArrayList();
+ return this.capabilities;
+ }
+
+ public boolean hasCapabilities() {
+ if (this.capabilities == null)
+ return false;
+ for (TestScriptMetadataCapabilitiesComponent item : this.capabilities)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ /**
+ * @return {@link #capabilities} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.)
+ */
+ // syntactic sugar
+ public TestScriptMetadataCapabilitiesComponent addCapabilities() { //3
+ TestScriptMetadataCapabilitiesComponent t = new TestScriptMetadataCapabilitiesComponent();
+ if (this.capabilities == null)
+ this.capabilities = new ArrayList();
+ this.capabilities.add(t);
+ return t;
+ }
+
+ // syntactic sugar
+ public TestScriptMetadataComponent addCapabilities(TestScriptMetadataCapabilitiesComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.capabilities == null)
+ this.capabilities = new ArrayList();
+ this.capabilities.add(t);
+ return this;
+ }
+
+ protected void listChildren(List childrenList) {
+ super.listChildren(childrenList);
+ childrenList.add(new Property("link", "", "A link to the FHIR specification that this test is covering.", 0, java.lang.Integer.MAX_VALUE, link));
+ childrenList.add(new Property("capabilities", "", "Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.", 0, java.lang.Integer.MAX_VALUE, capabilities));
+ }
+
+ public TestScriptMetadataComponent copy() {
+ TestScriptMetadataComponent dst = new TestScriptMetadataComponent();
+ copyValues(dst);
+ if (link != null) {
+ dst.link = new ArrayList();
+ for (TestScriptMetadataLinkComponent i : link)
+ dst.link.add(i.copy());
+ };
+ if (capabilities != null) {
+ dst.capabilities = new ArrayList();
+ for (TestScriptMetadataCapabilitiesComponent i : capabilities)
+ dst.capabilities.add(i.copy());
+ };
+ return dst;
+ }
+
+ @Override
+ public boolean equalsDeep(Base other) {
+ if (!super.equalsDeep(other))
+ return false;
+ if (!(other instanceof TestScriptMetadataComponent))
+ return false;
+ TestScriptMetadataComponent o = (TestScriptMetadataComponent) other;
+ return compareDeep(link, o.link, true) && compareDeep(capabilities, o.capabilities, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other) {
+ if (!super.equalsShallow(other))
+ return false;
+ if (!(other instanceof TestScriptMetadataComponent))
+ return false;
+ TestScriptMetadataComponent o = (TestScriptMetadataComponent) other;
+ return true;
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && (link == null || link.isEmpty()) && (capabilities == null || capabilities.isEmpty())
+ ;
+ }
+
+ }
+
+ @Block()
+ public static class TestScriptMetadataLinkComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * URL to a particular requirement or feature within the FHIR specification.
+ */
+ @Child(name = "url", type = {UriType.class}, order=1, min=1, max=1)
+ @Description(shortDefinition="URL to the specification", formalDefinition="URL to a particular requirement or feature within the FHIR specification." )
+ protected UriType url;
+
+ /**
+ * Short description of the link.
+ */
+ @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1)
+ @Description(shortDefinition="Short description", formalDefinition="Short description of the link." )
+ protected StringType description;
+
+ private static final long serialVersionUID = 213372298L;
+
+ /*
+ * Constructor
+ */
+ public TestScriptMetadataLinkComponent() {
+ super();
+ }
+
+ /*
+ * Constructor
+ */
+ public TestScriptMetadataLinkComponent(UriType url) {
+ super();
+ this.url = url;
+ }
+
+ /**
+ * @return {@link #url} (URL to a particular requirement or feature within the FHIR specification.). 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)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptMetadataLinkComponent.url");
+ else if (Configuration.doAutoCreate())
+ this.url = new UriType(); // bb
+ return this.url;
+ }
+
+ public boolean hasUrlElement() {
+ return this.url != null && !this.url.isEmpty();
+ }
+
+ public boolean hasUrl() {
+ return this.url != null && !this.url.isEmpty();
+ }
+
+ /**
+ * @param value {@link #url} (URL to a particular requirement or feature within the FHIR specification.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+ */
+ public TestScriptMetadataLinkComponent setUrlElement(UriType value) {
+ this.url = value;
+ return this;
+ }
+
+ /**
+ * @return URL to a particular requirement or feature within the FHIR specification.
+ */
+ public String getUrl() {
+ return this.url == null ? null : this.url.getValue();
+ }
+
+ /**
+ * @param value URL to a particular requirement or feature within the FHIR specification.
+ */
+ public TestScriptMetadataLinkComponent setUrl(String value) {
+ if (this.url == null)
+ this.url = new UriType();
+ this.url.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #description} (Short description of the link.). 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 TestScriptMetadataLinkComponent.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} (Short description of the link.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
+ */
+ public TestScriptMetadataLinkComponent setDescriptionElement(StringType value) {
+ this.description = value;
+ return this;
+ }
+
+ /**
+ * @return Short description of the link.
+ */
+ public String getDescription() {
+ return this.description == null ? null : this.description.getValue();
+ }
+
+ /**
+ * @param value Short description of the link.
+ */
+ public TestScriptMetadataLinkComponent 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 childrenList) {
+ super.listChildren(childrenList);
+ childrenList.add(new Property("url", "uri", "URL to a particular requirement or feature within the FHIR specification.", 0, java.lang.Integer.MAX_VALUE, url));
+ childrenList.add(new Property("description", "string", "Short description of the link.", 0, java.lang.Integer.MAX_VALUE, description));
+ }
+
+ public TestScriptMetadataLinkComponent copy() {
+ TestScriptMetadataLinkComponent dst = new TestScriptMetadataLinkComponent();
+ copyValues(dst);
+ dst.url = url == null ? null : url.copy();
+ dst.description = description == null ? null : description.copy();
+ return dst;
+ }
+
+ @Override
+ public boolean equalsDeep(Base other) {
+ if (!super.equalsDeep(other))
+ return false;
+ if (!(other instanceof TestScriptMetadataLinkComponent))
+ return false;
+ TestScriptMetadataLinkComponent o = (TestScriptMetadataLinkComponent) other;
+ return compareDeep(url, o.url, true) && compareDeep(description, o.description, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other) {
+ if (!super.equalsShallow(other))
+ return false;
+ if (!(other instanceof TestScriptMetadataLinkComponent))
+ return false;
+ TestScriptMetadataLinkComponent o = (TestScriptMetadataLinkComponent) other;
+ return compareValues(url, o.url, true) && compareValues(description, o.description, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && (url == null || url.isEmpty()) && (description == null || description.isEmpty())
+ ;
+ }
+
+ }
+
+ @Block()
+ public static class TestScriptMetadataCapabilitiesComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * The capabilities required of the server in order for this test script to execute.
+ */
+ @Child(name = "required", type = {BooleanType.class}, order=1, min=0, max=1)
+ @Description(shortDefinition="Required capabilities", formalDefinition="The capabilities required of the server in order for this test script to execute." )
+ protected BooleanType required;
+
+ /**
+ * Whether or not the capabilities are primarily getting validated by this test script.
+ */
+ @Child(name = "validated", type = {BooleanType.class}, order=2, min=0, max=1)
+ @Description(shortDefinition="Validated capabilities", formalDefinition="Whether or not the capabilities are primarily getting validated by this test script." )
+ protected BooleanType validated;
+
+ /**
+ * Description of the capabilities that this test script is requiring the server to support.
+ */
+ @Child(name = "description", type = {StringType.class}, order=3, min=0, max=1)
+ @Description(shortDefinition="The description of the capabilities", formalDefinition="Description of the capabilities that this test script is requiring the server to support." )
+ protected StringType description;
+
+ /**
+ * Which server these requirements apply to.
+ */
+ @Child(name = "destination", type = {IntegerType.class}, order=4, min=0, max=1)
+ @Description(shortDefinition="Which server these requirements apply to", formalDefinition="Which server these requirements apply to." )
+ protected IntegerType destination;
+
+ /**
+ * Links to the FHIR specification that describes this interaction and the resources involved in more detail.
+ */
+ @Child(name = "link", type = {UriType.class}, order=5, min=0, max=Child.MAX_UNLIMITED)
+ @Description(shortDefinition="Links to the FHIR specification", formalDefinition="Links to the FHIR specification that describes this interaction and the resources involved in more detail." )
+ protected List link;
+
+ /**
+ * Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.
+ */
+ @Child(name = "conformance", type = {Conformance.class}, order=6, min=1, max=1)
+ @Description(shortDefinition="Required Conformance", formalDefinition="Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped." )
+ protected Reference conformance;
+
+ /**
+ * The actual object that is the target of the reference (Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.)
+ */
+ protected Conformance conformanceTarget;
+
+ private static final long serialVersionUID = 1318523355L;
+
+ /*
+ * Constructor
+ */
+ public TestScriptMetadataCapabilitiesComponent() {
+ super();
+ }
+
+ /*
+ * Constructor
+ */
+ public TestScriptMetadataCapabilitiesComponent(Reference conformance) {
+ super();
+ this.conformance = conformance;
+ }
+
+ /**
+ * @return {@link #required} (The capabilities required of the server in order for this test script to execute.). This is the underlying object with id, value and extensions. The accessor "getRequired" gives direct access to the value
+ */
+ public BooleanType getRequiredElement() {
+ if (this.required == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.required");
+ else if (Configuration.doAutoCreate())
+ this.required = new BooleanType(); // bb
+ return this.required;
+ }
+
+ public boolean hasRequiredElement() {
+ return this.required != null && !this.required.isEmpty();
+ }
+
+ public boolean hasRequired() {
+ return this.required != null && !this.required.isEmpty();
+ }
+
+ /**
+ * @param value {@link #required} (The capabilities required of the server in order for this test script to execute.). This is the underlying object with id, value and extensions. The accessor "getRequired" gives direct access to the value
+ */
+ public TestScriptMetadataCapabilitiesComponent setRequiredElement(BooleanType value) {
+ this.required = value;
+ return this;
+ }
+
+ /**
+ * @return The capabilities required of the server in order for this test script to execute.
+ */
+ public boolean getRequired() {
+ return this.required == null || this.required.isEmpty() ? false : this.required.getValue();
+ }
+
+ /**
+ * @param value The capabilities required of the server in order for this test script to execute.
+ */
+ public TestScriptMetadataCapabilitiesComponent setRequired(boolean value) {
+ if (this.required == null)
+ this.required = new BooleanType();
+ this.required.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #validated} (Whether or not the capabilities are primarily getting validated by this test script.). This is the underlying object with id, value and extensions. The accessor "getValidated" gives direct access to the value
+ */
+ public BooleanType getValidatedElement() {
+ if (this.validated == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.validated");
+ else if (Configuration.doAutoCreate())
+ this.validated = new BooleanType(); // bb
+ return this.validated;
+ }
+
+ public boolean hasValidatedElement() {
+ return this.validated != null && !this.validated.isEmpty();
+ }
+
+ public boolean hasValidated() {
+ return this.validated != null && !this.validated.isEmpty();
+ }
+
+ /**
+ * @param value {@link #validated} (Whether or not the capabilities are primarily getting validated by this test script.). This is the underlying object with id, value and extensions. The accessor "getValidated" gives direct access to the value
+ */
+ public TestScriptMetadataCapabilitiesComponent setValidatedElement(BooleanType value) {
+ this.validated = value;
+ return this;
+ }
+
+ /**
+ * @return Whether or not the capabilities are primarily getting validated by this test script.
+ */
+ public boolean getValidated() {
+ return this.validated == null || this.validated.isEmpty() ? false : this.validated.getValue();
+ }
+
+ /**
+ * @param value Whether or not the capabilities are primarily getting validated by this test script.
+ */
+ public TestScriptMetadataCapabilitiesComponent setValidated(boolean value) {
+ if (this.validated == null)
+ this.validated = new BooleanType();
+ this.validated.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #description} (Description of the capabilities that this test script is requiring the server to support.). 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 TestScriptMetadataCapabilitiesComponent.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} (Description of the capabilities that this test script is requiring the server to support.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
+ */
+ public TestScriptMetadataCapabilitiesComponent setDescriptionElement(StringType value) {
+ this.description = value;
+ return this;
+ }
+
+ /**
+ * @return Description of the capabilities that this test script is requiring the server to support.
+ */
+ public String getDescription() {
+ return this.description == null ? null : this.description.getValue();
+ }
+
+ /**
+ * @param value Description of the capabilities that this test script is requiring the server to support.
+ */
+ public TestScriptMetadataCapabilitiesComponent 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;
+ }
+
+ /**
+ * @return {@link #destination} (Which server these requirements apply to.). This is the underlying object with id, value and extensions. The accessor "getDestination" gives direct access to the value
+ */
+ public IntegerType getDestinationElement() {
+ if (this.destination == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.destination");
+ else if (Configuration.doAutoCreate())
+ this.destination = new IntegerType(); // bb
+ return this.destination;
+ }
+
+ public boolean hasDestinationElement() {
+ return this.destination != null && !this.destination.isEmpty();
+ }
+
+ public boolean hasDestination() {
+ return this.destination != null && !this.destination.isEmpty();
+ }
+
+ /**
+ * @param value {@link #destination} (Which server these requirements apply to.). This is the underlying object with id, value and extensions. The accessor "getDestination" gives direct access to the value
+ */
+ public TestScriptMetadataCapabilitiesComponent setDestinationElement(IntegerType value) {
+ this.destination = value;
+ return this;
+ }
+
+ /**
+ * @return Which server these requirements apply to.
+ */
+ public int getDestination() {
+ return this.destination == null || this.destination.isEmpty() ? 0 : this.destination.getValue();
+ }
+
+ /**
+ * @param value Which server these requirements apply to.
+ */
+ public TestScriptMetadataCapabilitiesComponent setDestination(int value) {
+ if (this.destination == null)
+ this.destination = new IntegerType();
+ this.destination.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #link} (Links to the FHIR specification that describes this interaction and the resources involved in more detail.)
+ */
+ public List getLink() {
+ if (this.link == null)
+ this.link = new ArrayList();
+ return this.link;
+ }
+
+ public boolean hasLink() {
+ if (this.link == null)
+ return false;
+ for (UriType item : this.link)
+ if (!item.isEmpty())
+ return true;
+ return false;
+ }
+
+ /**
+ * @return {@link #link} (Links to the FHIR specification that describes this interaction and the resources involved in more detail.)
+ */
+ // syntactic sugar
+ public UriType addLinkElement() {//2
+ UriType t = new UriType();
+ if (this.link == null)
+ this.link = new ArrayList();
+ this.link.add(t);
+ return t;
+ }
+
+ /**
+ * @param value {@link #link} (Links to the FHIR specification that describes this interaction and the resources involved in more detail.)
+ */
+ public TestScriptMetadataCapabilitiesComponent addLink(String value) { //1
+ UriType t = new UriType();
+ t.setValue(value);
+ if (this.link == null)
+ this.link = new ArrayList();
+ this.link.add(t);
+ return this;
+ }
+
+ /**
+ * @param value {@link #link} (Links to the FHIR specification that describes this interaction and the resources involved in more detail.)
+ */
+ public boolean hasLink(String value) {
+ if (this.link == null)
+ return false;
+ for (UriType v : this.link)
+ if (v.equals(value)) // uri
+ return true;
+ return false;
+ }
+
+ /**
+ * @return {@link #conformance} (Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.)
+ */
+ public Reference getConformance() {
+ if (this.conformance == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.conformance");
+ else if (Configuration.doAutoCreate())
+ this.conformance = new Reference(); // cc
+ return this.conformance;
+ }
+
+ public boolean hasConformance() {
+ return this.conformance != null && !this.conformance.isEmpty();
+ }
+
+ /**
+ * @param value {@link #conformance} (Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.)
+ */
+ public TestScriptMetadataCapabilitiesComponent setConformance(Reference value) {
+ this.conformance = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #conformance} 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. (Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.)
+ */
+ public Conformance getConformanceTarget() {
+ if (this.conformanceTarget == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptMetadataCapabilitiesComponent.conformance");
+ else if (Configuration.doAutoCreate())
+ this.conformanceTarget = new Conformance(); // aa
+ return this.conformanceTarget;
+ }
+
+ /**
+ * @param value {@link #conformance} 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. (Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.)
+ */
+ public TestScriptMetadataCapabilitiesComponent setConformanceTarget(Conformance value) {
+ this.conformanceTarget = value;
+ return this;
+ }
+
+ protected void listChildren(List childrenList) {
+ super.listChildren(childrenList);
+ childrenList.add(new Property("required", "boolean", "The capabilities required of the server in order for this test script to execute.", 0, java.lang.Integer.MAX_VALUE, required));
+ childrenList.add(new Property("validated", "boolean", "Whether or not the capabilities are primarily getting validated by this test script.", 0, java.lang.Integer.MAX_VALUE, validated));
+ childrenList.add(new Property("description", "string", "Description of the capabilities that this test script is requiring the server to support.", 0, java.lang.Integer.MAX_VALUE, description));
+ childrenList.add(new Property("destination", "integer", "Which server these requirements apply to.", 0, java.lang.Integer.MAX_VALUE, destination));
+ childrenList.add(new Property("link", "uri", "Links to the FHIR specification that describes this interaction and the resources involved in more detail.", 0, java.lang.Integer.MAX_VALUE, link));
+ childrenList.add(new Property("conformance", "Reference(Conformance)", "Minimum conformance required of server for test script to execute successfully. If server does not meet at a minimum the reference conformance definition, then all tests in this script are skipped.", 0, java.lang.Integer.MAX_VALUE, conformance));
+ }
+
+ public TestScriptMetadataCapabilitiesComponent copy() {
+ TestScriptMetadataCapabilitiesComponent dst = new TestScriptMetadataCapabilitiesComponent();
+ copyValues(dst);
+ dst.required = required == null ? null : required.copy();
+ dst.validated = validated == null ? null : validated.copy();
+ dst.description = description == null ? null : description.copy();
+ dst.destination = destination == null ? null : destination.copy();
+ if (link != null) {
+ dst.link = new ArrayList();
+ for (UriType i : link)
+ dst.link.add(i.copy());
+ };
+ dst.conformance = conformance == null ? null : conformance.copy();
+ return dst;
+ }
+
+ @Override
+ public boolean equalsDeep(Base other) {
+ if (!super.equalsDeep(other))
+ return false;
+ if (!(other instanceof TestScriptMetadataCapabilitiesComponent))
+ return false;
+ TestScriptMetadataCapabilitiesComponent o = (TestScriptMetadataCapabilitiesComponent) other;
+ return compareDeep(required, o.required, true) && compareDeep(validated, o.validated, true) && compareDeep(description, o.description, true)
+ && compareDeep(destination, o.destination, true) && compareDeep(link, o.link, true) && compareDeep(conformance, o.conformance, true)
+ ;
+ }
+
+ @Override
+ public boolean equalsShallow(Base other) {
+ if (!super.equalsShallow(other))
+ return false;
+ if (!(other instanceof TestScriptMetadataCapabilitiesComponent))
+ return false;
+ TestScriptMetadataCapabilitiesComponent o = (TestScriptMetadataCapabilitiesComponent) other;
+ return compareValues(required, o.required, true) && compareValues(validated, o.validated, true) && compareValues(description, o.description, true)
+ && compareValues(destination, o.destination, true) && compareValues(link, o.link, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && (required == null || required.isEmpty()) && (validated == null || validated.isEmpty())
+ && (description == null || description.isEmpty()) && (destination == null || destination.isEmpty())
+ && (link == null || link.isEmpty()) && (conformance == null || conformance.isEmpty());
+ }
+
+ }
+
@Block()
public static class TestScriptFixtureComponent extends BackboneElement implements IBaseBackboneElement {
- /**
- * The URI of the fixture. Each fixture shall have a "uri" or "resource" but not both. The "uri" shall resolve to a valid Resource. The "uri" may be local or remote, absolute or relative.
- */
- @Child(name = "uri", type = {UriType.class}, order=1, min=0, max=1)
- @Description(shortDefinition="URI of the fixture", formalDefinition="The URI of the fixture. Each fixture shall have a 'uri' or 'resource' but not both. The 'uri' shall resolve to a valid Resource. The 'uri' may be local or remote, absolute or relative." )
- protected UriType uri;
-
- /**
- * The fixture resource actually embedded in this TestScript. Each fixture should have a "uri" or "resource" but not both.
- */
- @Child(name = "resource", type = {Resource.class}, order=2, min=0, max=1)
- @Description(shortDefinition="Fixture resource", formalDefinition="The fixture resource actually embedded in this TestScript. Each fixture should have a 'uri' or 'resource' but not both." )
- protected Resource resource;
-
/**
* Whether or not to implicitly create the fixture during setup. If true, the fixture is automatically created on each server being tested during setup, therefore no create operation is required for this fixture in the TestScript.setup section.
*/
- @Child(name = "autocreate", type = {BooleanType.class}, order=3, min=0, max=1)
+ @Child(name = "autocreate", type = {BooleanType.class}, order=1, min=0, max=1)
@Description(shortDefinition="Whether or not to implicitly create the fixture during setup", formalDefinition="Whether or not to implicitly create the fixture during setup. If true, the fixture is automatically created on each server being tested during setup, therefore no create operation is required for this fixture in the TestScript.setup section." )
protected BooleanType autocreate;
/**
* Whether or not to implicitly delete the fixture during teardown If true, the fixture is automatically deleted on each server being tested during teardown, therefore no delete operation is required for this fixture in the TestScript.teardown section.
*/
- @Child(name = "autodelete", type = {BooleanType.class}, order=4, min=0, max=1)
+ @Child(name = "autodelete", type = {BooleanType.class}, order=2, min=0, max=1)
@Description(shortDefinition="Whether or not to implicitly delete the fixture during teardown", formalDefinition="Whether or not to implicitly delete the fixture during teardown If true, the fixture is automatically deleted on each server being tested during teardown, therefore no delete operation is required for this fixture in the TestScript.teardown section." )
protected BooleanType autodelete;
- private static final long serialVersionUID = 1455581555L;
+ /**
+ * Reference to the resource (containing the contents of the resource needed for operations).
+ */
+ @Child(name = "resource", type = {Reference.class}, order=3, min=0, max=1)
+ @Description(shortDefinition="Reference of the resource", formalDefinition="Reference to the resource (containing the contents of the resource needed for operations)." )
+ protected Reference resource;
+
+ private static final long serialVersionUID = 672117234L;
/*
* Constructor
@@ -412,74 +1486,6 @@ public class TestScript extends DomainResource {
super();
}
- /**
- * @return {@link #uri} (The URI of the fixture. Each fixture shall have a "uri" or "resource" but not both. The "uri" shall resolve to a valid Resource. The "uri" may be local or remote, absolute or relative.). This is the underlying object with id, value and extensions. The accessor "getUri" gives direct access to the value
- */
- public UriType getUriElement() {
- if (this.uri == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create TestScriptFixtureComponent.uri");
- else if (Configuration.doAutoCreate())
- this.uri = new UriType(); // bb
- return this.uri;
- }
-
- public boolean hasUriElement() {
- return this.uri != null && !this.uri.isEmpty();
- }
-
- public boolean hasUri() {
- return this.uri != null && !this.uri.isEmpty();
- }
-
- /**
- * @param value {@link #uri} (The URI of the fixture. Each fixture shall have a "uri" or "resource" but not both. The "uri" shall resolve to a valid Resource. The "uri" may be local or remote, absolute or relative.). This is the underlying object with id, value and extensions. The accessor "getUri" gives direct access to the value
- */
- public TestScriptFixtureComponent setUriElement(UriType value) {
- this.uri = value;
- return this;
- }
-
- /**
- * @return The URI of the fixture. Each fixture shall have a "uri" or "resource" but not both. The "uri" shall resolve to a valid Resource. The "uri" may be local or remote, absolute or relative.
- */
- public String getUri() {
- return this.uri == null ? null : this.uri.getValue();
- }
-
- /**
- * @param value The URI of the fixture. Each fixture shall have a "uri" or "resource" but not both. The "uri" shall resolve to a valid Resource. The "uri" may be local or remote, absolute or relative.
- */
- public TestScriptFixtureComponent setUri(String value) {
- if (Utilities.noString(value))
- this.uri = null;
- else {
- if (this.uri == null)
- this.uri = new UriType();
- this.uri.setValue(value);
- }
- return this;
- }
-
- /**
- * @return {@link #resource} (The fixture resource actually embedded in this TestScript. Each fixture should have a "uri" or "resource" but not both.)
- */
- public Resource getResource() {
- return this.resource;
- }
-
- public boolean hasResource() {
- return this.resource != null && !this.resource.isEmpty();
- }
-
- /**
- * @param value {@link #resource} (The fixture resource actually embedded in this TestScript. Each fixture should have a "uri" or "resource" but not both.)
- */
- public TestScriptFixtureComponent setResource(Resource value) {
- this.resource = value;
- return this;
- }
-
/**
* @return {@link #autocreate} (Whether or not to implicitly create the fixture during setup. If true, the fixture is automatically created on each server being tested during setup, therefore no create operation is required for this fixture in the TestScript.setup section.). This is the underlying object with id, value and extensions. The accessor "getAutocreate" gives direct access to the value
*/
@@ -570,21 +1576,43 @@ public class TestScript extends DomainResource {
return this;
}
+ /**
+ * @return {@link #resource} (Reference to the resource (containing the contents of the resource needed for operations).)
+ */
+ public Reference getResource() {
+ if (this.resource == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptFixtureComponent.resource");
+ else if (Configuration.doAutoCreate())
+ this.resource = new Reference(); // cc
+ return this.resource;
+ }
+
+ public boolean hasResource() {
+ return this.resource != null && !this.resource.isEmpty();
+ }
+
+ /**
+ * @param value {@link #resource} (Reference to the resource (containing the contents of the resource needed for operations).)
+ */
+ public TestScriptFixtureComponent setResource(Reference value) {
+ this.resource = value;
+ return this;
+ }
+
protected void listChildren(List childrenList) {
super.listChildren(childrenList);
- childrenList.add(new Property("uri", "uri", "The URI of the fixture. Each fixture shall have a 'uri' or 'resource' but not both. The 'uri' shall resolve to a valid Resource. The 'uri' may be local or remote, absolute or relative.", 0, java.lang.Integer.MAX_VALUE, uri));
- childrenList.add(new Property("resource", "Resource", "The fixture resource actually embedded in this TestScript. Each fixture should have a 'uri' or 'resource' but not both.", 0, java.lang.Integer.MAX_VALUE, resource));
childrenList.add(new Property("autocreate", "boolean", "Whether or not to implicitly create the fixture during setup. If true, the fixture is automatically created on each server being tested during setup, therefore no create operation is required for this fixture in the TestScript.setup section.", 0, java.lang.Integer.MAX_VALUE, autocreate));
childrenList.add(new Property("autodelete", "boolean", "Whether or not to implicitly delete the fixture during teardown If true, the fixture is automatically deleted on each server being tested during teardown, therefore no delete operation is required for this fixture in the TestScript.teardown section.", 0, java.lang.Integer.MAX_VALUE, autodelete));
+ childrenList.add(new Property("resource", "Reference", "Reference to the resource (containing the contents of the resource needed for operations).", 0, java.lang.Integer.MAX_VALUE, resource));
}
public TestScriptFixtureComponent copy() {
TestScriptFixtureComponent dst = new TestScriptFixtureComponent();
copyValues(dst);
- dst.uri = uri == null ? null : uri.copy();
- dst.resource = resource == null ? null : resource.copy();
dst.autocreate = autocreate == null ? null : autocreate.copy();
dst.autodelete = autodelete == null ? null : autodelete.copy();
+ dst.resource = resource == null ? null : resource.copy();
return dst;
}
@@ -595,8 +1623,8 @@ public class TestScript extends DomainResource {
if (!(other instanceof TestScriptFixtureComponent))
return false;
TestScriptFixtureComponent o = (TestScriptFixtureComponent) other;
- return compareDeep(uri, o.uri, true) && compareDeep(resource, o.resource, true) && compareDeep(autocreate, o.autocreate, true)
- && compareDeep(autodelete, o.autodelete, true);
+ return compareDeep(autocreate, o.autocreate, true) && compareDeep(autodelete, o.autodelete, true)
+ && compareDeep(resource, o.resource, true);
}
@Override
@@ -606,14 +1634,299 @@ public class TestScript extends DomainResource {
if (!(other instanceof TestScriptFixtureComponent))
return false;
TestScriptFixtureComponent o = (TestScriptFixtureComponent) other;
- return compareValues(uri, o.uri, true) && compareValues(autocreate, o.autocreate, true) && compareValues(autodelete, o.autodelete, true)
+ return compareValues(autocreate, o.autocreate, true) && compareValues(autodelete, o.autodelete, true)
;
}
public boolean isEmpty() {
- return super.isEmpty() && (uri == null || uri.isEmpty()) && (resource == null || resource.isEmpty())
- && (autocreate == null || autocreate.isEmpty()) && (autodelete == null || autodelete.isEmpty())
- ;
+ return super.isEmpty() && (autocreate == null || autocreate.isEmpty()) && (autodelete == null || autodelete.isEmpty())
+ && (resource == null || resource.isEmpty());
+ }
+
+ }
+
+ @Block()
+ public static class TestScriptVariableComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * Variable name.
+ */
+ @Child(name = "name", type = {StringType.class}, order=1, min=1, max=1)
+ @Description(shortDefinition="Variable name", formalDefinition="Variable name." )
+ protected StringType name;
+
+ /**
+ * Will be used to grab the header field value from the headers that sourceId is pointing to.
+ */
+ @Child(name = "headerField", type = {StringType.class}, order=2, min=0, max=1)
+ @Description(shortDefinition="Header field name", formalDefinition="Will be used to grab the header field value from the headers that sourceId is pointing to." )
+ protected StringType headerField;
+
+ /**
+ * XPath or JSONPath against the fixture body. When variables are defined, either headerField must be specified or path, but not both.
+ */
+ @Child(name = "path", type = {StringType.class}, order=3, min=0, max=1)
+ @Description(shortDefinition="XPath or JSONPath against the fixture body", formalDefinition="XPath or JSONPath against the fixture body. When variables are defined, either headerField must be specified or path, but not both." )
+ protected StringType path;
+
+ /**
+ * Fixture to evaluate the XPath/JSONPath expression or the headerField against.
+ */
+ @Child(name = "sourceId", type = {IdType.class}, order=4, min=0, max=1)
+ @Description(shortDefinition="Fixture Id", formalDefinition="Fixture to evaluate the XPath/JSONPath expression or the headerField against." )
+ protected IdType sourceId;
+
+ private static final long serialVersionUID = 1128806685L;
+
+ /*
+ * Constructor
+ */
+ public TestScriptVariableComponent() {
+ super();
+ }
+
+ /*
+ * Constructor
+ */
+ public TestScriptVariableComponent(StringType name) {
+ super();
+ this.name = name;
+ }
+
+ /**
+ * @return {@link #name} (Variable name.). 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 TestScriptVariableComponent.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} (Variable name.). This is the underlying object with id, value and extensions. The accessor "getName" gives direct access to the value
+ */
+ public TestScriptVariableComponent setNameElement(StringType value) {
+ this.name = value;
+ return this;
+ }
+
+ /**
+ * @return Variable name.
+ */
+ public String getName() {
+ return this.name == null ? null : this.name.getValue();
+ }
+
+ /**
+ * @param value Variable name.
+ */
+ public TestScriptVariableComponent setName(String value) {
+ if (this.name == null)
+ this.name = new StringType();
+ this.name.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #headerField} (Will be used to grab the header field value from the headers that sourceId is pointing to.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value
+ */
+ public StringType getHeaderFieldElement() {
+ if (this.headerField == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptVariableComponent.headerField");
+ else if (Configuration.doAutoCreate())
+ this.headerField = new StringType(); // bb
+ return this.headerField;
+ }
+
+ public boolean hasHeaderFieldElement() {
+ return this.headerField != null && !this.headerField.isEmpty();
+ }
+
+ public boolean hasHeaderField() {
+ return this.headerField != null && !this.headerField.isEmpty();
+ }
+
+ /**
+ * @param value {@link #headerField} (Will be used to grab the header field value from the headers that sourceId is pointing to.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value
+ */
+ public TestScriptVariableComponent setHeaderFieldElement(StringType value) {
+ this.headerField = value;
+ return this;
+ }
+
+ /**
+ * @return Will be used to grab the header field value from the headers that sourceId is pointing to.
+ */
+ public String getHeaderField() {
+ return this.headerField == null ? null : this.headerField.getValue();
+ }
+
+ /**
+ * @param value Will be used to grab the header field value from the headers that sourceId is pointing to.
+ */
+ public TestScriptVariableComponent setHeaderField(String value) {
+ if (Utilities.noString(value))
+ this.headerField = null;
+ else {
+ if (this.headerField == null)
+ this.headerField = new StringType();
+ this.headerField.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #path} (XPath or JSONPath against the fixture body. When variables are defined, either headerField must be specified or path, but not both.). This is the underlying object with id, value and extensions. The accessor "getPath" gives direct access to the value
+ */
+ public StringType getPathElement() {
+ if (this.path == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptVariableComponent.path");
+ else if (Configuration.doAutoCreate())
+ this.path = new StringType(); // bb
+ return this.path;
+ }
+
+ public boolean hasPathElement() {
+ return this.path != null && !this.path.isEmpty();
+ }
+
+ public boolean hasPath() {
+ return this.path != null && !this.path.isEmpty();
+ }
+
+ /**
+ * @param value {@link #path} (XPath or JSONPath against the fixture body. When variables are defined, either headerField must be specified or path, but not both.). This is the underlying object with id, value and extensions. The accessor "getPath" gives direct access to the value
+ */
+ public TestScriptVariableComponent setPathElement(StringType value) {
+ this.path = value;
+ return this;
+ }
+
+ /**
+ * @return XPath or JSONPath against the fixture body. When variables are defined, either headerField must be specified or path, but not both.
+ */
+ public String getPath() {
+ return this.path == null ? null : this.path.getValue();
+ }
+
+ /**
+ * @param value XPath or JSONPath against the fixture body. When variables are defined, either headerField must be specified or path, but not both.
+ */
+ public TestScriptVariableComponent setPath(String value) {
+ if (Utilities.noString(value))
+ this.path = null;
+ else {
+ if (this.path == null)
+ this.path = new StringType();
+ this.path.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #sourceId} (Fixture to evaluate the XPath/JSONPath expression or the headerField against.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value
+ */
+ public IdType getSourceIdElement() {
+ if (this.sourceId == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptVariableComponent.sourceId");
+ else if (Configuration.doAutoCreate())
+ this.sourceId = new IdType(); // bb
+ return this.sourceId;
+ }
+
+ public boolean hasSourceIdElement() {
+ return this.sourceId != null && !this.sourceId.isEmpty();
+ }
+
+ public boolean hasSourceId() {
+ return this.sourceId != null && !this.sourceId.isEmpty();
+ }
+
+ /**
+ * @param value {@link #sourceId} (Fixture to evaluate the XPath/JSONPath expression or the headerField against.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value
+ */
+ public TestScriptVariableComponent setSourceIdElement(IdType value) {
+ this.sourceId = value;
+ return this;
+ }
+
+ /**
+ * @return Fixture to evaluate the XPath/JSONPath expression or the headerField against.
+ */
+ public String getSourceId() {
+ return this.sourceId == null ? null : this.sourceId.getValue();
+ }
+
+ /**
+ * @param value Fixture to evaluate the XPath/JSONPath expression or the headerField against.
+ */
+ public TestScriptVariableComponent setSourceId(String value) {
+ if (Utilities.noString(value))
+ this.sourceId = null;
+ else {
+ if (this.sourceId == null)
+ this.sourceId = new IdType();
+ this.sourceId.setValue(value);
+ }
+ return this;
+ }
+
+ protected void listChildren(List childrenList) {
+ super.listChildren(childrenList);
+ childrenList.add(new Property("name", "string", "Variable name.", 0, java.lang.Integer.MAX_VALUE, name));
+ childrenList.add(new Property("headerField", "string", "Will be used to grab the header field value from the headers that sourceId is pointing to.", 0, java.lang.Integer.MAX_VALUE, headerField));
+ childrenList.add(new Property("path", "string", "XPath or JSONPath against the fixture body. When variables are defined, either headerField must be specified or path, but not both.", 0, java.lang.Integer.MAX_VALUE, path));
+ childrenList.add(new Property("sourceId", "id", "Fixture to evaluate the XPath/JSONPath expression or the headerField against.", 0, java.lang.Integer.MAX_VALUE, sourceId));
+ }
+
+ public TestScriptVariableComponent copy() {
+ TestScriptVariableComponent dst = new TestScriptVariableComponent();
+ copyValues(dst);
+ dst.name = name == null ? null : name.copy();
+ dst.headerField = headerField == null ? null : headerField.copy();
+ dst.path = path == null ? null : path.copy();
+ dst.sourceId = sourceId == null ? null : sourceId.copy();
+ return dst;
+ }
+
+ @Override
+ public boolean equalsDeep(Base other) {
+ if (!super.equalsDeep(other))
+ return false;
+ if (!(other instanceof TestScriptVariableComponent))
+ return false;
+ TestScriptVariableComponent o = (TestScriptVariableComponent) other;
+ return compareDeep(name, o.name, true) && compareDeep(headerField, o.headerField, true) && compareDeep(path, o.path, true)
+ && compareDeep(sourceId, o.sourceId, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other) {
+ if (!super.equalsShallow(other))
+ return false;
+ if (!(other instanceof TestScriptVariableComponent))
+ return false;
+ TestScriptVariableComponent o = (TestScriptVariableComponent) other;
+ return compareValues(name, o.name, true) && compareValues(headerField, o.headerField, true) && compareValues(path, o.path, true)
+ && compareValues(sourceId, o.sourceId, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && (name == null || name.isEmpty()) && (headerField == null || headerField.isEmpty())
+ && (path == null || path.isEmpty()) && (sourceId == null || sourceId.isEmpty());
}
}
@@ -621,13 +1934,20 @@ public class TestScript extends DomainResource {
@Block()
public static class TestScriptSetupComponent extends BackboneElement implements IBaseBackboneElement {
/**
- * A setup operation.
+ * Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.
*/
- @Child(name = "operation", type = {}, order=1, min=1, max=Child.MAX_UNLIMITED)
- @Description(shortDefinition="A setup operation", formalDefinition="A setup operation." )
- protected List operation;
+ @Child(name = "metadata", type = {TestScriptMetadataComponent.class}, order=1, min=0, max=1)
+ @Description(shortDefinition="Capabiltities that are assumed to function correctly on the FHIR server being tested", formalDefinition="Capabilties that must exist and is assumed to function correctly on the FHIR server being tested." )
+ protected TestScriptMetadataComponent metadata;
- private static final long serialVersionUID = -61721475L;
+ /**
+ * Action would contain either an operation or an assertion.
+ */
+ @Child(name = "action", type = {}, order=2, min=1, max=Child.MAX_UNLIMITED)
+ @Description(shortDefinition="Action", formalDefinition="Action would contain either an operation or an assertion." )
+ protected List action;
+
+ private static final long serialVersionUID = -1836543723L;
/*
* Constructor
@@ -637,57 +1957,83 @@ public class TestScript extends DomainResource {
}
/**
- * @return {@link #operation} (A setup operation.)
+ * @return {@link #metadata} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.)
*/
- public List getOperation() {
- if (this.operation == null)
- this.operation = new ArrayList();
- return this.operation;
+ public TestScriptMetadataComponent getMetadata() {
+ if (this.metadata == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupComponent.metadata");
+ else if (Configuration.doAutoCreate())
+ this.metadata = new TestScriptMetadataComponent(); // cc
+ return this.metadata;
}
- public boolean hasOperation() {
- if (this.operation == null)
+ public boolean hasMetadata() {
+ return this.metadata != null && !this.metadata.isEmpty();
+ }
+
+ /**
+ * @param value {@link #metadata} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.)
+ */
+ public TestScriptSetupComponent setMetadata(TestScriptMetadataComponent value) {
+ this.metadata = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #action} (Action would contain either an operation or an assertion.)
+ */
+ public List getAction() {
+ if (this.action == null)
+ this.action = new ArrayList();
+ return this.action;
+ }
+
+ public boolean hasAction() {
+ if (this.action == null)
return false;
- for (TestScriptSetupOperationComponent item : this.operation)
+ for (TestScriptSetupActionComponent item : this.action)
if (!item.isEmpty())
return true;
return false;
}
/**
- * @return {@link #operation} (A setup operation.)
+ * @return {@link #action} (Action would contain either an operation or an assertion.)
*/
// syntactic sugar
- public TestScriptSetupOperationComponent addOperation() { //3
- TestScriptSetupOperationComponent t = new TestScriptSetupOperationComponent();
- if (this.operation == null)
- this.operation = new ArrayList();
- this.operation.add(t);
+ public TestScriptSetupActionComponent addAction() { //3
+ TestScriptSetupActionComponent t = new TestScriptSetupActionComponent();
+ if (this.action == null)
+ this.action = new ArrayList();
+ this.action.add(t);
return t;
}
// syntactic sugar
- public TestScriptSetupComponent addOperation(TestScriptSetupOperationComponent t) { //3
+ public TestScriptSetupComponent addAction(TestScriptSetupActionComponent t) { //3
if (t == null)
return this;
- if (this.operation == null)
- this.operation = new ArrayList();
- this.operation.add(t);
+ if (this.action == null)
+ this.action = new ArrayList();
+ this.action.add(t);
return this;
}
protected void listChildren(List childrenList) {
super.listChildren(childrenList);
- childrenList.add(new Property("operation", "", "A setup operation.", 0, java.lang.Integer.MAX_VALUE, operation));
+ childrenList.add(new Property("metadata", "@TestScript.metadata", "Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.", 0, java.lang.Integer.MAX_VALUE, metadata));
+ childrenList.add(new Property("action", "", "Action would contain either an operation or an assertion.", 0, java.lang.Integer.MAX_VALUE, action));
}
public TestScriptSetupComponent copy() {
TestScriptSetupComponent dst = new TestScriptSetupComponent();
copyValues(dst);
- if (operation != null) {
- dst.operation = new ArrayList();
- for (TestScriptSetupOperationComponent i : operation)
- dst.operation.add(i.copy());
+ dst.metadata = metadata == null ? null : metadata.copy();
+ if (action != null) {
+ dst.action = new ArrayList();
+ for (TestScriptSetupActionComponent i : action)
+ dst.action.add(i.copy());
};
return dst;
}
@@ -699,7 +2045,7 @@ public class TestScript extends DomainResource {
if (!(other instanceof TestScriptSetupComponent))
return false;
TestScriptSetupComponent o = (TestScriptSetupComponent) other;
- return compareDeep(operation, o.operation, true);
+ return compareDeep(metadata, o.metadata, true) && compareDeep(action, o.action, true);
}
@Override
@@ -713,86 +2059,235 @@ public class TestScript extends DomainResource {
}
public boolean isEmpty() {
- return super.isEmpty() && (operation == null || operation.isEmpty());
+ return super.isEmpty() && (metadata == null || metadata.isEmpty()) && (action == null || action.isEmpty())
+ ;
}
}
@Block()
- public static class TestScriptSetupOperationComponent extends BackboneElement implements IBaseBackboneElement {
+ public static class TestScriptSetupActionComponent extends BackboneElement implements IBaseBackboneElement {
/**
- * read | vread | update | delete | history | create | search | transaction | conformance | tags | mailbox | document | assertion | assertion_false | assertion_warning.
+ * An operation.
*/
- @Child(name = "type", type = {CodeType.class}, order=1, min=1, max=1)
- @Description(shortDefinition="read | vread | update | delete | history | create | search | transaction | conformance | tags | mailbox | document | assertion | assertion_false | assertion_warning", formalDefinition="read | vread | update | delete | history | create | search | transaction | conformance | tags | mailbox | document | assertion | assertion_false | assertion_warning." )
+ @Child(name = "operation", type = {}, order=1, min=0, max=1)
+ @Description(shortDefinition="An operation", formalDefinition="An operation." )
+ protected TestScriptSetupActionOperationComponent operation;
+
+ /**
+ * Evaluates the results of previous operations to determine if the server under test behaves appropriately.
+ */
+ @Child(name = "assert", type = {}, order=2, min=0, max=1)
+ @Description(shortDefinition="Assertion", formalDefinition="Evaluates the results of previous operations to determine if the server under test behaves appropriately." )
+ protected TestScriptSetupActionAssertComponent assert_;
+
+ private static final long serialVersionUID = 1411550037L;
+
+ /*
+ * Constructor
+ */
+ public TestScriptSetupActionComponent() {
+ super();
+ }
+
+ /**
+ * @return {@link #operation} (An operation.)
+ */
+ public TestScriptSetupActionOperationComponent getOperation() {
+ if (this.operation == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionComponent.operation");
+ else if (Configuration.doAutoCreate())
+ this.operation = new TestScriptSetupActionOperationComponent(); // cc
+ return this.operation;
+ }
+
+ public boolean hasOperation() {
+ return this.operation != null && !this.operation.isEmpty();
+ }
+
+ /**
+ * @param value {@link #operation} (An operation.)
+ */
+ public TestScriptSetupActionComponent setOperation(TestScriptSetupActionOperationComponent value) {
+ this.operation = value;
+ return this;
+ }
+
+ /**
+ * @return {@link #assert_} (Evaluates the results of previous operations to determine if the server under test behaves appropriately.)
+ */
+ public TestScriptSetupActionAssertComponent getAssert() {
+ if (this.assert_ == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionComponent.assert_");
+ else if (Configuration.doAutoCreate())
+ this.assert_ = new TestScriptSetupActionAssertComponent(); // cc
+ return this.assert_;
+ }
+
+ public boolean hasAssert() {
+ return this.assert_ != null && !this.assert_.isEmpty();
+ }
+
+ /**
+ * @param value {@link #assert_} (Evaluates the results of previous operations to determine if the server under test behaves appropriately.)
+ */
+ public TestScriptSetupActionComponent setAssert(TestScriptSetupActionAssertComponent value) {
+ this.assert_ = value;
+ return this;
+ }
+
+ protected void listChildren(List childrenList) {
+ super.listChildren(childrenList);
+ childrenList.add(new Property("operation", "", "An operation.", 0, java.lang.Integer.MAX_VALUE, operation));
+ childrenList.add(new Property("assert", "", "Evaluates the results of previous operations to determine if the server under test behaves appropriately.", 0, java.lang.Integer.MAX_VALUE, assert_));
+ }
+
+ public TestScriptSetupActionComponent copy() {
+ TestScriptSetupActionComponent dst = new TestScriptSetupActionComponent();
+ copyValues(dst);
+ dst.operation = operation == null ? null : operation.copy();
+ dst.assert_ = assert_ == null ? null : assert_.copy();
+ return dst;
+ }
+
+ @Override
+ public boolean equalsDeep(Base other) {
+ if (!super.equalsDeep(other))
+ return false;
+ if (!(other instanceof TestScriptSetupActionComponent))
+ return false;
+ TestScriptSetupActionComponent o = (TestScriptSetupActionComponent) other;
+ return compareDeep(operation, o.operation, true) && compareDeep(assert_, o.assert_, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other) {
+ if (!super.equalsShallow(other))
+ return false;
+ if (!(other instanceof TestScriptSetupActionComponent))
+ return false;
+ TestScriptSetupActionComponent o = (TestScriptSetupActionComponent) other;
+ return true;
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && (operation == null || operation.isEmpty()) && (assert_ == null || assert_.isEmpty())
+ ;
+ }
+
+ }
+
+ @Block()
+ public static class TestScriptSetupActionOperationComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * Server interaction or operation type.
+ */
+ @Child(name = "type", type = {CodeType.class}, order=1, min=0, max=1)
+ @Description(shortDefinition="read | vread | update | delete | history | create | search | transaction | conformance | tags | mailbox | document", formalDefinition="Server interaction or operation type." )
protected Enumeration type;
/**
- * The internal id of the fixture used as the body of any operation.type that results in a PUT or POST.
+ * The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.
*/
- @Child(name = "source", type = {IdType.class}, order=2, min=0, max=1)
- @Description(shortDefinition="The id of the fixture used as the body in a PUT or POST", formalDefinition="The internal id of the fixture used as the body of any operation.type that results in a PUT or POST." )
- protected IdType source;
+ @Child(name = "resource", type = {CodeType.class}, order=2, min=0, max=1)
+ @Description(shortDefinition="Resource type", formalDefinition="The type of the resource. See http://hl7-fhir.github.io/resourcelist.html." )
+ protected CodeType resource;
/**
- * The id of the fixture used as the target of any operation.type that results in a PUT or POST, or the id of the fixture used to store the results of a GET.
+ * The label would be used for tracking/logging purposes by test engines.
*/
- @Child(name = "target", type = {IdType.class}, order=3, min=0, max=1)
- @Description(shortDefinition="The id of the fixture used as the target of a PUT or POST, or the id of the fixture used to store the results of a GET", formalDefinition="The id of the fixture used as the target of any operation.type that results in a PUT or POST, or the id of the fixture used to store the results of a GET." )
- protected IdType target;
+ @Child(name = "label", type = {StringType.class}, order=3, min=0, max=1)
+ @Description(shortDefinition="Operation label", formalDefinition="The label would be used for tracking/logging purposes by test engines." )
+ protected StringType label;
+
+ /**
+ * The description would be used by test engines for tracking and reporting purposes.
+ */
+ @Child(name = "description", type = {StringType.class}, order=4, min=0, max=1)
+ @Description(shortDefinition="Operation description", formalDefinition="The description would be used by test engines for tracking and reporting purposes." )
+ protected StringType description;
+
+ /**
+ * The content-type or mime-type to use for RESTful operation in the 'Accept' header.
+ */
+ @Child(name = "accept", type = {CodeType.class}, order=5, min=0, max=1)
+ @Description(shortDefinition="xml | json", formalDefinition="The content-type or mime-type to use for RESTful operation in the 'Accept' header." )
+ protected Enumeration accept;
+
+ /**
+ * The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.
+ */
+ @Child(name = "contentType", type = {CodeType.class}, order=6, min=0, max=1)
+ @Description(shortDefinition="xml | json", formalDefinition="The content-type or mime-type to use for RESTful operation in the 'Content-Type' header." )
+ protected Enumeration contentType;
/**
* Which server to perform the operation on.
*/
- @Child(name = "destination", type = {IntegerType.class}, order=4, min=0, max=1)
+ @Child(name = "destination", type = {IntegerType.class}, order=7, min=0, max=1)
@Description(shortDefinition="Which server to perform the operation on", formalDefinition="Which server to perform the operation on." )
protected IntegerType destination;
/**
- * Arguments to an operation.
+ * Path plus parameters after [type]. Used to set parts of the request URL explicitly.
*/
- @Child(name = "parameter", type = {StringType.class}, order=5, min=0, max=Child.MAX_UNLIMITED)
- @Description(shortDefinition="Arguments to an operation", formalDefinition="Arguments to an operation." )
- protected List parameter;
+ @Child(name = "params", type = {StringType.class}, order=8, min=0, max=1)
+ @Description(shortDefinition="Params", formalDefinition="Path plus parameters after [type]. Used to set parts of the request URL explicitly." )
+ protected StringType params;
+
+ /**
+ * Header elements would be used to set HTTP headers.
+ */
+ @Child(name = "requestHeader", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED)
+ @Description(shortDefinition="Each operation can have one ore more header elements", formalDefinition="Header elements would be used to set HTTP headers." )
+ protected List requestHeader;
/**
* The fixture id (maybe new) to map to the response.
*/
- @Child(name = "responseId", type = {IdType.class}, order=6, min=0, max=1)
- @Description(shortDefinition="Response id", formalDefinition="The fixture id (maybe new) to map to the response." )
+ @Child(name = "responseId", type = {IdType.class}, order=10, min=0, max=1)
+ @Description(shortDefinition="Response Id", formalDefinition="The fixture id (maybe new) to map to the response." )
protected IdType responseId;
/**
- * The content-type or mime-type to use for RESTful operation.
+ * The id of the fixture used as the body of a PUT or POST request.
*/
- @Child(name = "contentType", type = {CodeType.class}, order=7, min=0, max=1)
- @Description(shortDefinition="xml | json", formalDefinition="The content-type or mime-type to use for RESTful operation." )
- protected Enumeration contentType;
+ @Child(name = "sourceId", type = {IdType.class}, order=11, min=0, max=1)
+ @Description(shortDefinition="Fixture Id of body for PUT and POST requests", formalDefinition="The id of the fixture used as the body of a PUT or POST request." )
+ protected IdType sourceId;
- private static final long serialVersionUID = 1788056082L;
+ /**
+ * Id of fixture used for extracting the [id], [type], and [vid] for GET requests.
+ */
+ @Child(name = "targetId", type = {IdType.class}, order=12, min=0, max=1)
+ @Description(shortDefinition="Id of fixture used for extracting the [id], [type], and [vid] for GET requests", formalDefinition="Id of fixture used for extracting the [id], [type], and [vid] for GET requests." )
+ protected IdType targetId;
+
+ /**
+ * Complete request URL.
+ */
+ @Child(name = "url", type = {StringType.class}, order=13, min=0, max=1)
+ @Description(shortDefinition="Request URL", formalDefinition="Complete request URL." )
+ protected StringType url;
+
+ private static final long serialVersionUID = -731696218L;
/*
* Constructor
*/
- public TestScriptSetupOperationComponent() {
+ public TestScriptSetupActionOperationComponent() {
super();
}
- /*
- * Constructor
- */
- public TestScriptSetupOperationComponent(Enumeration type) {
- super();
- this.type = type;
- }
-
/**
- * @return {@link #type} (read | vread | update | delete | history | create | search | transaction | conformance | tags | mailbox | document | assertion | assertion_false | assertion_warning.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+ * @return {@link #type} (Server interaction or operation type.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
*/
public Enumeration getTypeElement() {
if (this.type == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create TestScriptSetupOperationComponent.type");
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.type");
else if (Configuration.doAutoCreate())
this.type = new Enumeration(new TestOperationTypeEnumFactory()); // bb
return this.type;
@@ -807,124 +2302,275 @@ public class TestScript extends DomainResource {
}
/**
- * @param value {@link #type} (read | vread | update | delete | history | create | search | transaction | conformance | tags | mailbox | document | assertion | assertion_false | assertion_warning.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
+ * @param value {@link #type} (Server interaction or operation type.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value
*/
- public TestScriptSetupOperationComponent setTypeElement(Enumeration value) {
+ public TestScriptSetupActionOperationComponent setTypeElement(Enumeration value) {
this.type = value;
return this;
}
/**
- * @return read | vread | update | delete | history | create | search | transaction | conformance | tags | mailbox | document | assertion | assertion_false | assertion_warning.
+ * @return Server interaction or operation type.
*/
public TestOperationType getType() {
return this.type == null ? null : this.type.getValue();
}
/**
- * @param value read | vread | update | delete | history | create | search | transaction | conformance | tags | mailbox | document | assertion | assertion_false | assertion_warning.
+ * @param value Server interaction or operation type.
*/
- public TestScriptSetupOperationComponent setType(TestOperationType value) {
+ public TestScriptSetupActionOperationComponent setType(TestOperationType value) {
+ if (value == null)
+ this.type = null;
+ else {
if (this.type == null)
this.type = new Enumeration(new TestOperationTypeEnumFactory());
this.type.setValue(value);
- return this;
- }
-
- /**
- * @return {@link #source} (The internal id of the fixture used as the body of any operation.type that results in a PUT or POST.). This is the underlying object with id, value and extensions. The accessor "getSource" gives direct access to the value
- */
- public IdType getSourceElement() {
- if (this.source == null)
- if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create TestScriptSetupOperationComponent.source");
- else if (Configuration.doAutoCreate())
- this.source = new IdType(); // bb
- return this.source;
- }
-
- public boolean hasSourceElement() {
- return this.source != null && !this.source.isEmpty();
- }
-
- public boolean hasSource() {
- return this.source != null && !this.source.isEmpty();
- }
-
- /**
- * @param value {@link #source} (The internal id of the fixture used as the body of any operation.type that results in a PUT or POST.). This is the underlying object with id, value and extensions. The accessor "getSource" gives direct access to the value
- */
- public TestScriptSetupOperationComponent setSourceElement(IdType value) {
- this.source = value;
- return this;
- }
-
- /**
- * @return The internal id of the fixture used as the body of any operation.type that results in a PUT or POST.
- */
- public String getSource() {
- return this.source == null ? null : this.source.getValue();
- }
-
- /**
- * @param value The internal id of the fixture used as the body of any operation.type that results in a PUT or POST.
- */
- public TestScriptSetupOperationComponent setSource(String value) {
- if (Utilities.noString(value))
- this.source = null;
- else {
- if (this.source == null)
- this.source = new IdType();
- this.source.setValue(value);
}
return this;
}
/**
- * @return {@link #target} (The id of the fixture used as the target of any operation.type that results in a PUT or POST, or the id of the fixture used to store the results of a GET.). This is the underlying object with id, value and extensions. The accessor "getTarget" gives direct access to the value
+ * @return {@link #resource} (The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.). This is the underlying object with id, value and extensions. The accessor "getResource" gives direct access to the value
*/
- public IdType getTargetElement() {
- if (this.target == null)
+ public CodeType getResourceElement() {
+ if (this.resource == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create TestScriptSetupOperationComponent.target");
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.resource");
else if (Configuration.doAutoCreate())
- this.target = new IdType(); // bb
- return this.target;
+ this.resource = new CodeType(); // bb
+ return this.resource;
}
- public boolean hasTargetElement() {
- return this.target != null && !this.target.isEmpty();
+ public boolean hasResourceElement() {
+ return this.resource != null && !this.resource.isEmpty();
}
- public boolean hasTarget() {
- return this.target != null && !this.target.isEmpty();
+ public boolean hasResource() {
+ return this.resource != null && !this.resource.isEmpty();
}
/**
- * @param value {@link #target} (The id of the fixture used as the target of any operation.type that results in a PUT or POST, or the id of the fixture used to store the results of a GET.). This is the underlying object with id, value and extensions. The accessor "getTarget" gives direct access to the value
+ * @param value {@link #resource} (The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.). This is the underlying object with id, value and extensions. The accessor "getResource" gives direct access to the value
*/
- public TestScriptSetupOperationComponent setTargetElement(IdType value) {
- this.target = value;
+ public TestScriptSetupActionOperationComponent setResourceElement(CodeType value) {
+ this.resource = value;
return this;
}
/**
- * @return The id of the fixture used as the target of any operation.type that results in a PUT or POST, or the id of the fixture used to store the results of a GET.
+ * @return The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.
*/
- public String getTarget() {
- return this.target == null ? null : this.target.getValue();
+ public String getResource() {
+ return this.resource == null ? null : this.resource.getValue();
}
/**
- * @param value The id of the fixture used as the target of any operation.type that results in a PUT or POST, or the id of the fixture used to store the results of a GET.
+ * @param value The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.
*/
- public TestScriptSetupOperationComponent setTarget(String value) {
+ public TestScriptSetupActionOperationComponent setResource(String value) {
if (Utilities.noString(value))
- this.target = null;
+ this.resource = null;
else {
- if (this.target == null)
- this.target = new IdType();
- this.target.setValue(value);
+ if (this.resource == null)
+ this.resource = new CodeType();
+ this.resource.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #label} (The label would be used for tracking/logging purposes by test engines.). This is the underlying object with id, value and extensions. The accessor "getLabel" gives direct access to the value
+ */
+ public StringType getLabelElement() {
+ if (this.label == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.label");
+ else if (Configuration.doAutoCreate())
+ this.label = new StringType(); // bb
+ return this.label;
+ }
+
+ public boolean hasLabelElement() {
+ return this.label != null && !this.label.isEmpty();
+ }
+
+ public boolean hasLabel() {
+ return this.label != null && !this.label.isEmpty();
+ }
+
+ /**
+ * @param value {@link #label} (The label would be used for tracking/logging purposes by test engines.). This is the underlying object with id, value and extensions. The accessor "getLabel" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationComponent setLabelElement(StringType value) {
+ this.label = value;
+ return this;
+ }
+
+ /**
+ * @return The label would be used for tracking/logging purposes by test engines.
+ */
+ public String getLabel() {
+ return this.label == null ? null : this.label.getValue();
+ }
+
+ /**
+ * @param value The label would be used for tracking/logging purposes by test engines.
+ */
+ public TestScriptSetupActionOperationComponent setLabel(String value) {
+ if (Utilities.noString(value))
+ this.label = null;
+ else {
+ if (this.label == null)
+ this.label = new StringType();
+ this.label.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #description} (The description would be used by test engines for tracking and reporting purposes.). 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 TestScriptSetupActionOperationComponent.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} (The description would be used by test engines for tracking and reporting purposes.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationComponent setDescriptionElement(StringType value) {
+ this.description = value;
+ return this;
+ }
+
+ /**
+ * @return The description would be used by test engines for tracking and reporting purposes.
+ */
+ public String getDescription() {
+ return this.description == null ? null : this.description.getValue();
+ }
+
+ /**
+ * @param value The description would be used by test engines for tracking and reporting purposes.
+ */
+ public TestScriptSetupActionOperationComponent 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;
+ }
+
+ /**
+ * @return {@link #accept} (The content-type or mime-type to use for RESTful operation in the 'Accept' header.). This is the underlying object with id, value and extensions. The accessor "getAccept" gives direct access to the value
+ */
+ public Enumeration getAcceptElement() {
+ if (this.accept == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.accept");
+ else if (Configuration.doAutoCreate())
+ this.accept = new Enumeration(new ContentTypeEnumFactory()); // bb
+ return this.accept;
+ }
+
+ public boolean hasAcceptElement() {
+ return this.accept != null && !this.accept.isEmpty();
+ }
+
+ public boolean hasAccept() {
+ return this.accept != null && !this.accept.isEmpty();
+ }
+
+ /**
+ * @param value {@link #accept} (The content-type or mime-type to use for RESTful operation in the 'Accept' header.). This is the underlying object with id, value and extensions. The accessor "getAccept" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationComponent setAcceptElement(Enumeration value) {
+ this.accept = value;
+ return this;
+ }
+
+ /**
+ * @return The content-type or mime-type to use for RESTful operation in the 'Accept' header.
+ */
+ public ContentType getAccept() {
+ return this.accept == null ? null : this.accept.getValue();
+ }
+
+ /**
+ * @param value The content-type or mime-type to use for RESTful operation in the 'Accept' header.
+ */
+ public TestScriptSetupActionOperationComponent setAccept(ContentType value) {
+ if (value == null)
+ this.accept = null;
+ else {
+ if (this.accept == null)
+ this.accept = new Enumeration(new ContentTypeEnumFactory());
+ this.accept.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #contentType} (The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.). This is the underlying object with id, value and extensions. The accessor "getContentType" gives direct access to the value
+ */
+ public Enumeration getContentTypeElement() {
+ if (this.contentType == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.contentType");
+ else if (Configuration.doAutoCreate())
+ this.contentType = new Enumeration(new ContentTypeEnumFactory()); // bb
+ return this.contentType;
+ }
+
+ public boolean hasContentTypeElement() {
+ return this.contentType != null && !this.contentType.isEmpty();
+ }
+
+ public boolean hasContentType() {
+ return this.contentType != null && !this.contentType.isEmpty();
+ }
+
+ /**
+ * @param value {@link #contentType} (The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.). This is the underlying object with id, value and extensions. The accessor "getContentType" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationComponent setContentTypeElement(Enumeration value) {
+ this.contentType = value;
+ return this;
+ }
+
+ /**
+ * @return The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.
+ */
+ public ContentType getContentType() {
+ return this.contentType == null ? null : this.contentType.getValue();
+ }
+
+ /**
+ * @param value The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.
+ */
+ public TestScriptSetupActionOperationComponent setContentType(ContentType value) {
+ if (value == null)
+ this.contentType = null;
+ else {
+ if (this.contentType == null)
+ this.contentType = new Enumeration(new ContentTypeEnumFactory());
+ this.contentType.setValue(value);
}
return this;
}
@@ -935,7 +2581,7 @@ public class TestScript extends DomainResource {
public IntegerType getDestinationElement() {
if (this.destination == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create TestScriptSetupOperationComponent.destination");
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.destination");
else if (Configuration.doAutoCreate())
this.destination = new IntegerType(); // bb
return this.destination;
@@ -952,7 +2598,7 @@ public class TestScript extends DomainResource {
/**
* @param value {@link #destination} (Which server to perform the operation on.). This is the underlying object with id, value and extensions. The accessor "getDestination" gives direct access to the value
*/
- public TestScriptSetupOperationComponent setDestinationElement(IntegerType value) {
+ public TestScriptSetupActionOperationComponent setDestinationElement(IntegerType value) {
this.destination = value;
return this;
}
@@ -967,7 +2613,7 @@ public class TestScript extends DomainResource {
/**
* @param value Which server to perform the operation on.
*/
- public TestScriptSetupOperationComponent setDestination(int value) {
+ public TestScriptSetupActionOperationComponent setDestination(int value) {
if (this.destination == null)
this.destination = new IntegerType();
this.destination.setValue(value);
@@ -975,66 +2621,101 @@ public class TestScript extends DomainResource {
}
/**
- * @return {@link #parameter} (Arguments to an operation.)
+ * @return {@link #params} (Path plus parameters after [type]. Used to set parts of the request URL explicitly.). This is the underlying object with id, value and extensions. The accessor "getParams" gives direct access to the value
*/
- public List getParameter() {
- if (this.parameter == null)
- this.parameter = new ArrayList();
- return this.parameter;
+ public StringType getParamsElement() {
+ if (this.params == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.params");
+ else if (Configuration.doAutoCreate())
+ this.params = new StringType(); // bb
+ return this.params;
}
- public boolean hasParameter() {
- if (this.parameter == null)
+ public boolean hasParamsElement() {
+ return this.params != null && !this.params.isEmpty();
+ }
+
+ public boolean hasParams() {
+ return this.params != null && !this.params.isEmpty();
+ }
+
+ /**
+ * @param value {@link #params} (Path plus parameters after [type]. Used to set parts of the request URL explicitly.). This is the underlying object with id, value and extensions. The accessor "getParams" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationComponent setParamsElement(StringType value) {
+ this.params = value;
+ return this;
+ }
+
+ /**
+ * @return Path plus parameters after [type]. Used to set parts of the request URL explicitly.
+ */
+ public String getParams() {
+ return this.params == null ? null : this.params.getValue();
+ }
+
+ /**
+ * @param value Path plus parameters after [type]. Used to set parts of the request URL explicitly.
+ */
+ public TestScriptSetupActionOperationComponent setParams(String value) {
+ if (Utilities.noString(value))
+ this.params = null;
+ else {
+ if (this.params == null)
+ this.params = new StringType();
+ this.params.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #requestHeader} (Header elements would be used to set HTTP headers.)
+ */
+ public List getRequestHeader() {
+ if (this.requestHeader == null)
+ this.requestHeader = new ArrayList();
+ return this.requestHeader;
+ }
+
+ public boolean hasRequestHeader() {
+ if (this.requestHeader == null)
return false;
- for (StringType item : this.parameter)
+ for (TestScriptSetupActionOperationRequestHeaderComponent item : this.requestHeader)
if (!item.isEmpty())
return true;
return false;
}
/**
- * @return {@link #parameter} (Arguments to an operation.)
+ * @return {@link #requestHeader} (Header elements would be used to set HTTP headers.)
*/
// syntactic sugar
- public StringType addParameterElement() {//2
- StringType t = new StringType();
- if (this.parameter == null)
- this.parameter = new ArrayList();
- this.parameter.add(t);
+ public TestScriptSetupActionOperationRequestHeaderComponent addRequestHeader() { //3
+ TestScriptSetupActionOperationRequestHeaderComponent t = new TestScriptSetupActionOperationRequestHeaderComponent();
+ if (this.requestHeader == null)
+ this.requestHeader = new ArrayList();
+ this.requestHeader.add(t);
return t;
}
- /**
- * @param value {@link #parameter} (Arguments to an operation.)
- */
- public TestScriptSetupOperationComponent addParameter(String value) { //1
- StringType t = new StringType();
- t.setValue(value);
- if (this.parameter == null)
- this.parameter = new ArrayList();
- this.parameter.add(t);
+ // syntactic sugar
+ public TestScriptSetupActionOperationComponent addRequestHeader(TestScriptSetupActionOperationRequestHeaderComponent t) { //3
+ if (t == null)
+ return this;
+ if (this.requestHeader == null)
+ this.requestHeader = new ArrayList();
+ this.requestHeader.add(t);
return this;
}
- /**
- * @param value {@link #parameter} (Arguments to an operation.)
- */
- public boolean hasParameter(String value) {
- if (this.parameter == null)
- return false;
- for (StringType v : this.parameter)
- if (v.equals(value)) // string
- return true;
- return false;
- }
-
/**
* @return {@link #responseId} (The fixture id (maybe new) to map to the response.). This is the underlying object with id, value and extensions. The accessor "getResponseId" gives direct access to the value
*/
public IdType getResponseIdElement() {
if (this.responseId == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create TestScriptSetupOperationComponent.responseId");
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.responseId");
else if (Configuration.doAutoCreate())
this.responseId = new IdType(); // bb
return this.responseId;
@@ -1051,7 +2732,7 @@ public class TestScript extends DomainResource {
/**
* @param value {@link #responseId} (The fixture id (maybe new) to map to the response.). This is the underlying object with id, value and extensions. The accessor "getResponseId" gives direct access to the value
*/
- public TestScriptSetupOperationComponent setResponseIdElement(IdType value) {
+ public TestScriptSetupActionOperationComponent setResponseIdElement(IdType value) {
this.responseId = value;
return this;
}
@@ -1066,7 +2747,7 @@ public class TestScript extends DomainResource {
/**
* @param value The fixture id (maybe new) to map to the response.
*/
- public TestScriptSetupOperationComponent setResponseId(String value) {
+ public TestScriptSetupActionOperationComponent setResponseId(String value) {
if (Utilities.noString(value))
this.responseId = null;
else {
@@ -1078,12 +2759,729 @@ public class TestScript extends DomainResource {
}
/**
- * @return {@link #contentType} (The content-type or mime-type to use for RESTful operation.). This is the underlying object with id, value and extensions. The accessor "getContentType" gives direct access to the value
+ * @return {@link #sourceId} (The id of the fixture used as the body of a PUT or POST request.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value
+ */
+ public IdType getSourceIdElement() {
+ if (this.sourceId == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.sourceId");
+ else if (Configuration.doAutoCreate())
+ this.sourceId = new IdType(); // bb
+ return this.sourceId;
+ }
+
+ public boolean hasSourceIdElement() {
+ return this.sourceId != null && !this.sourceId.isEmpty();
+ }
+
+ public boolean hasSourceId() {
+ return this.sourceId != null && !this.sourceId.isEmpty();
+ }
+
+ /**
+ * @param value {@link #sourceId} (The id of the fixture used as the body of a PUT or POST request.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationComponent setSourceIdElement(IdType value) {
+ this.sourceId = value;
+ return this;
+ }
+
+ /**
+ * @return The id of the fixture used as the body of a PUT or POST request.
+ */
+ public String getSourceId() {
+ return this.sourceId == null ? null : this.sourceId.getValue();
+ }
+
+ /**
+ * @param value The id of the fixture used as the body of a PUT or POST request.
+ */
+ public TestScriptSetupActionOperationComponent setSourceId(String value) {
+ if (Utilities.noString(value))
+ this.sourceId = null;
+ else {
+ if (this.sourceId == null)
+ this.sourceId = new IdType();
+ this.sourceId.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #targetId} (Id of fixture used for extracting the [id], [type], and [vid] for GET requests.). This is the underlying object with id, value and extensions. The accessor "getTargetId" gives direct access to the value
+ */
+ public IdType getTargetIdElement() {
+ if (this.targetId == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.targetId");
+ else if (Configuration.doAutoCreate())
+ this.targetId = new IdType(); // bb
+ return this.targetId;
+ }
+
+ public boolean hasTargetIdElement() {
+ return this.targetId != null && !this.targetId.isEmpty();
+ }
+
+ public boolean hasTargetId() {
+ return this.targetId != null && !this.targetId.isEmpty();
+ }
+
+ /**
+ * @param value {@link #targetId} (Id of fixture used for extracting the [id], [type], and [vid] for GET requests.). This is the underlying object with id, value and extensions. The accessor "getTargetId" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationComponent setTargetIdElement(IdType value) {
+ this.targetId = value;
+ return this;
+ }
+
+ /**
+ * @return Id of fixture used for extracting the [id], [type], and [vid] for GET requests.
+ */
+ public String getTargetId() {
+ return this.targetId == null ? null : this.targetId.getValue();
+ }
+
+ /**
+ * @param value Id of fixture used for extracting the [id], [type], and [vid] for GET requests.
+ */
+ public TestScriptSetupActionOperationComponent setTargetId(String value) {
+ if (Utilities.noString(value))
+ this.targetId = null;
+ else {
+ if (this.targetId == null)
+ this.targetId = new IdType();
+ this.targetId.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #url} (Complete request URL.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+ */
+ public StringType getUrlElement() {
+ if (this.url == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationComponent.url");
+ else if (Configuration.doAutoCreate())
+ this.url = new StringType(); // bb
+ return this.url;
+ }
+
+ public boolean hasUrlElement() {
+ return this.url != null && !this.url.isEmpty();
+ }
+
+ public boolean hasUrl() {
+ return this.url != null && !this.url.isEmpty();
+ }
+
+ /**
+ * @param value {@link #url} (Complete request URL.). This is the underlying object with id, value and extensions. The accessor "getUrl" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationComponent setUrlElement(StringType value) {
+ this.url = value;
+ return this;
+ }
+
+ /**
+ * @return Complete request URL.
+ */
+ public String getUrl() {
+ return this.url == null ? null : this.url.getValue();
+ }
+
+ /**
+ * @param value Complete request URL.
+ */
+ public TestScriptSetupActionOperationComponent setUrl(String value) {
+ if (Utilities.noString(value))
+ this.url = null;
+ else {
+ if (this.url == null)
+ this.url = new StringType();
+ this.url.setValue(value);
+ }
+ return this;
+ }
+
+ protected void listChildren(List childrenList) {
+ super.listChildren(childrenList);
+ childrenList.add(new Property("type", "code", "Server interaction or operation type.", 0, java.lang.Integer.MAX_VALUE, type));
+ childrenList.add(new Property("resource", "code", "The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.", 0, java.lang.Integer.MAX_VALUE, resource));
+ childrenList.add(new Property("label", "string", "The label would be used for tracking/logging purposes by test engines.", 0, java.lang.Integer.MAX_VALUE, label));
+ childrenList.add(new Property("description", "string", "The description would be used by test engines for tracking and reporting purposes.", 0, java.lang.Integer.MAX_VALUE, description));
+ childrenList.add(new Property("accept", "code", "The content-type or mime-type to use for RESTful operation in the 'Accept' header.", 0, java.lang.Integer.MAX_VALUE, accept));
+ childrenList.add(new Property("contentType", "code", "The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.", 0, java.lang.Integer.MAX_VALUE, contentType));
+ childrenList.add(new Property("destination", "integer", "Which server to perform the operation on.", 0, java.lang.Integer.MAX_VALUE, destination));
+ childrenList.add(new Property("params", "string", "Path plus parameters after [type]. Used to set parts of the request URL explicitly.", 0, java.lang.Integer.MAX_VALUE, params));
+ childrenList.add(new Property("requestHeader", "", "Header elements would be used to set HTTP headers.", 0, java.lang.Integer.MAX_VALUE, requestHeader));
+ childrenList.add(new Property("responseId", "id", "The fixture id (maybe new) to map to the response.", 0, java.lang.Integer.MAX_VALUE, responseId));
+ childrenList.add(new Property("sourceId", "id", "The id of the fixture used as the body of a PUT or POST request.", 0, java.lang.Integer.MAX_VALUE, sourceId));
+ childrenList.add(new Property("targetId", "id", "Id of fixture used for extracting the [id], [type], and [vid] for GET requests.", 0, java.lang.Integer.MAX_VALUE, targetId));
+ childrenList.add(new Property("url", "string", "Complete request URL.", 0, java.lang.Integer.MAX_VALUE, url));
+ }
+
+ public TestScriptSetupActionOperationComponent copy() {
+ TestScriptSetupActionOperationComponent dst = new TestScriptSetupActionOperationComponent();
+ copyValues(dst);
+ dst.type = type == null ? null : type.copy();
+ dst.resource = resource == null ? null : resource.copy();
+ dst.label = label == null ? null : label.copy();
+ dst.description = description == null ? null : description.copy();
+ dst.accept = accept == null ? null : accept.copy();
+ dst.contentType = contentType == null ? null : contentType.copy();
+ dst.destination = destination == null ? null : destination.copy();
+ dst.params = params == null ? null : params.copy();
+ if (requestHeader != null) {
+ dst.requestHeader = new ArrayList();
+ for (TestScriptSetupActionOperationRequestHeaderComponent i : requestHeader)
+ dst.requestHeader.add(i.copy());
+ };
+ dst.responseId = responseId == null ? null : responseId.copy();
+ dst.sourceId = sourceId == null ? null : sourceId.copy();
+ dst.targetId = targetId == null ? null : targetId.copy();
+ dst.url = url == null ? null : url.copy();
+ return dst;
+ }
+
+ @Override
+ public boolean equalsDeep(Base other) {
+ if (!super.equalsDeep(other))
+ return false;
+ if (!(other instanceof TestScriptSetupActionOperationComponent))
+ return false;
+ TestScriptSetupActionOperationComponent o = (TestScriptSetupActionOperationComponent) other;
+ return compareDeep(type, o.type, true) && compareDeep(resource, o.resource, true) && compareDeep(label, o.label, true)
+ && compareDeep(description, o.description, true) && compareDeep(accept, o.accept, true) && compareDeep(contentType, o.contentType, true)
+ && compareDeep(destination, o.destination, true) && compareDeep(params, o.params, true) && compareDeep(requestHeader, o.requestHeader, true)
+ && compareDeep(responseId, o.responseId, true) && compareDeep(sourceId, o.sourceId, true) && compareDeep(targetId, o.targetId, true)
+ && compareDeep(url, o.url, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other) {
+ if (!super.equalsShallow(other))
+ return false;
+ if (!(other instanceof TestScriptSetupActionOperationComponent))
+ return false;
+ TestScriptSetupActionOperationComponent o = (TestScriptSetupActionOperationComponent) other;
+ return compareValues(type, o.type, true) && compareValues(resource, o.resource, true) && compareValues(label, o.label, true)
+ && compareValues(description, o.description, true) && compareValues(accept, o.accept, true) && compareValues(contentType, o.contentType, true)
+ && compareValues(destination, o.destination, true) && compareValues(params, o.params, true) && compareValues(responseId, o.responseId, true)
+ && compareValues(sourceId, o.sourceId, true) && compareValues(targetId, o.targetId, true) && compareValues(url, o.url, true)
+ ;
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && (type == null || type.isEmpty()) && (resource == null || resource.isEmpty())
+ && (label == null || label.isEmpty()) && (description == null || description.isEmpty()) && (accept == null || accept.isEmpty())
+ && (contentType == null || contentType.isEmpty()) && (destination == null || destination.isEmpty())
+ && (params == null || params.isEmpty()) && (requestHeader == null || requestHeader.isEmpty())
+ && (responseId == null || responseId.isEmpty()) && (sourceId == null || sourceId.isEmpty())
+ && (targetId == null || targetId.isEmpty()) && (url == null || url.isEmpty());
+ }
+
+ }
+
+ @Block()
+ public static class TestScriptSetupActionOperationRequestHeaderComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * The HTTP header field e.g. "Accept".
+ */
+ @Child(name = "field", type = {StringType.class}, order=1, min=1, max=1)
+ @Description(shortDefinition="Header field name", formalDefinition="The HTTP header field e.g. 'Accept'." )
+ protected StringType field;
+
+ /**
+ * The value of the header e.g. "application/xml".
+ */
+ @Child(name = "value", type = {StringType.class}, order=2, min=1, max=1)
+ @Description(shortDefinition="Header value", formalDefinition="The value of the header e.g. 'application/xml'." )
+ protected StringType value;
+
+ private static final long serialVersionUID = 274395337L;
+
+ /*
+ * Constructor
+ */
+ public TestScriptSetupActionOperationRequestHeaderComponent() {
+ super();
+ }
+
+ /*
+ * Constructor
+ */
+ public TestScriptSetupActionOperationRequestHeaderComponent(StringType field, StringType value) {
+ super();
+ this.field = field;
+ this.value = value;
+ }
+
+ /**
+ * @return {@link #field} (The HTTP header field e.g. "Accept".). This is the underlying object with id, value and extensions. The accessor "getField" gives direct access to the value
+ */
+ public StringType getFieldElement() {
+ if (this.field == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationRequestHeaderComponent.field");
+ else if (Configuration.doAutoCreate())
+ this.field = new StringType(); // bb
+ return this.field;
+ }
+
+ public boolean hasFieldElement() {
+ return this.field != null && !this.field.isEmpty();
+ }
+
+ public boolean hasField() {
+ return this.field != null && !this.field.isEmpty();
+ }
+
+ /**
+ * @param value {@link #field} (The HTTP header field e.g. "Accept".). This is the underlying object with id, value and extensions. The accessor "getField" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationRequestHeaderComponent setFieldElement(StringType value) {
+ this.field = value;
+ return this;
+ }
+
+ /**
+ * @return The HTTP header field e.g. "Accept".
+ */
+ public String getField() {
+ return this.field == null ? null : this.field.getValue();
+ }
+
+ /**
+ * @param value The HTTP header field e.g. "Accept".
+ */
+ public TestScriptSetupActionOperationRequestHeaderComponent setField(String value) {
+ if (this.field == null)
+ this.field = new StringType();
+ this.field.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #value} (The value of the header e.g. "application/xml".). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public StringType getValueElement() {
+ if (this.value == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionOperationRequestHeaderComponent.value");
+ else if (Configuration.doAutoCreate())
+ this.value = new StringType(); // bb
+ return this.value;
+ }
+
+ public boolean hasValueElement() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ public boolean hasValue() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ /**
+ * @param value {@link #value} (The value of the header e.g. "application/xml".). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public TestScriptSetupActionOperationRequestHeaderComponent setValueElement(StringType value) {
+ this.value = value;
+ return this;
+ }
+
+ /**
+ * @return The value of the header e.g. "application/xml".
+ */
+ public String getValue() {
+ return this.value == null ? null : this.value.getValue();
+ }
+
+ /**
+ * @param value The value of the header e.g. "application/xml".
+ */
+ public TestScriptSetupActionOperationRequestHeaderComponent setValue(String value) {
+ if (this.value == null)
+ this.value = new StringType();
+ this.value.setValue(value);
+ return this;
+ }
+
+ protected void listChildren(List childrenList) {
+ super.listChildren(childrenList);
+ childrenList.add(new Property("field", "string", "The HTTP header field e.g. 'Accept'.", 0, java.lang.Integer.MAX_VALUE, field));
+ childrenList.add(new Property("value", "string", "The value of the header e.g. 'application/xml'.", 0, java.lang.Integer.MAX_VALUE, value));
+ }
+
+ public TestScriptSetupActionOperationRequestHeaderComponent copy() {
+ TestScriptSetupActionOperationRequestHeaderComponent dst = new TestScriptSetupActionOperationRequestHeaderComponent();
+ copyValues(dst);
+ dst.field = field == null ? null : field.copy();
+ dst.value = value == null ? null : value.copy();
+ return dst;
+ }
+
+ @Override
+ public boolean equalsDeep(Base other) {
+ if (!super.equalsDeep(other))
+ return false;
+ if (!(other instanceof TestScriptSetupActionOperationRequestHeaderComponent))
+ return false;
+ TestScriptSetupActionOperationRequestHeaderComponent o = (TestScriptSetupActionOperationRequestHeaderComponent) other;
+ return compareDeep(field, o.field, true) && compareDeep(value, o.value, true);
+ }
+
+ @Override
+ public boolean equalsShallow(Base other) {
+ if (!super.equalsShallow(other))
+ return false;
+ if (!(other instanceof TestScriptSetupActionOperationRequestHeaderComponent))
+ return false;
+ TestScriptSetupActionOperationRequestHeaderComponent o = (TestScriptSetupActionOperationRequestHeaderComponent) other;
+ return compareValues(field, o.field, true) && compareValues(value, o.value, true);
+ }
+
+ public boolean isEmpty() {
+ return super.isEmpty() && (field == null || field.isEmpty()) && (value == null || value.isEmpty())
+ ;
+ }
+
+ }
+
+ @Block()
+ public static class TestScriptSetupActionAssertComponent extends BackboneElement implements IBaseBackboneElement {
+ /**
+ * The label would be used for tracking/logging purposes by test engines.
+ */
+ @Child(name = "label", type = {StringType.class}, order=1, min=0, max=1)
+ @Description(shortDefinition="Assertion label", formalDefinition="The label would be used for tracking/logging purposes by test engines." )
+ protected StringType label;
+
+ /**
+ * The description would be used by test engines for tracking and reporting purposes.
+ */
+ @Child(name = "description", type = {StringType.class}, order=2, min=0, max=1)
+ @Description(shortDefinition="Assertion description", formalDefinition="The description would be used by test engines for tracking and reporting purposes." )
+ protected StringType description;
+
+ /**
+ * Id of fixture used to compare the "sourceId/path" evaluations to.
+ */
+ @Child(name = "compareToSourceId", type = {StringType.class}, order=3, min=0, max=1)
+ @Description(shortDefinition="Id of fixture used to compare the 'sourceId/path' evaluations to", formalDefinition="Id of fixture used to compare the 'sourceId/path' evaluations to." )
+ protected StringType compareToSourceId;
+
+ /**
+ * XPath or JSONPath expression against fixture used to compare the "sourceId/path" evaluations to.
+ */
+ @Child(name = "compareToSourcePath", type = {StringType.class}, order=4, min=0, max=1)
+ @Description(shortDefinition="XPath or JSONPath expression against fixture used to compare the 'sourceId/path' evaluations to", formalDefinition="XPath or JSONPath expression against fixture used to compare the 'sourceId/path' evaluations to." )
+ protected StringType compareToSourcePath;
+
+ /**
+ * The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.
+ */
+ @Child(name = "contentType", type = {CodeType.class}, order=5, min=0, max=1)
+ @Description(shortDefinition="xml | json", formalDefinition="The content-type or mime-type to use for RESTful operation in the 'Content-Type' header." )
+ protected Enumeration contentType;
+
+ /**
+ * The header field e.g. 'Content-Location'.
+ */
+ @Child(name = "headerField", type = {StringType.class}, order=6, min=0, max=1)
+ @Description(shortDefinition="The header field", formalDefinition="The header field e.g. 'Content-Location'." )
+ protected StringType headerField;
+
+ /**
+ * The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId.
+ */
+ @Child(name = "minimumId", type = {StringType.class}, order=7, min=0, max=1)
+ @Description(shortDefinition="MinimumId", formalDefinition="The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId." )
+ protected StringType minimumId;
+
+ /**
+ * Navigation Links.
+ */
+ @Child(name = "navigationLinks", type = {BooleanType.class}, order=8, min=0, max=1)
+ @Description(shortDefinition="Navigation Links", formalDefinition="Navigation Links." )
+ protected BooleanType navigationLinks;
+
+ /**
+ * The operator type.
+ */
+ @Child(name = "operator", type = {CodeType.class}, order=9, min=0, max=1)
+ @Description(shortDefinition="equals | notEquals | in | notIn | greaterThan | lessThan | empty | notEmpty | contains | notContains", formalDefinition="The operator type." )
+ protected Enumeration operator;
+
+ /**
+ * The XPath or JSONPath expression to be evaluated against the fixture representing the response received from server.
+ */
+ @Child(name = "path", type = {StringType.class}, order=10, min=0, max=1)
+ @Description(shortDefinition="XPath or JSONPath expression", formalDefinition="The XPath or JSONPath expression to be evaluated against the fixture representing the response received from server." )
+ protected StringType path;
+
+ /**
+ * The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.
+ */
+ @Child(name = "resource", type = {CodeType.class}, order=11, min=0, max=1)
+ @Description(shortDefinition="Resource type", formalDefinition="The type of the resource. See http://hl7-fhir.github.io/resourcelist.html." )
+ protected CodeType resource;
+
+ /**
+ * okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable.
+ */
+ @Child(name = "response", type = {CodeType.class}, order=12, min=0, max=1)
+ @Description(shortDefinition="okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable", formalDefinition="okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable." )
+ protected Enumeration response;
+
+ /**
+ * HTTP Response Code.
+ */
+ @Child(name = "responseCode", type = {StringType.class}, order=13, min=0, max=1)
+ @Description(shortDefinition="Response Code", formalDefinition="HTTP Response Code." )
+ protected StringType responseCode;
+
+ /**
+ * Fixture to evaluate the XPath/JSONPath expression or the headerField against.
+ */
+ @Child(name = "sourceId", type = {IdType.class}, order=14, min=0, max=1)
+ @Description(shortDefinition="Fixture Id", formalDefinition="Fixture to evaluate the XPath/JSONPath expression or the headerField against." )
+ protected IdType sourceId;
+
+ /**
+ * The ID of the Profile to validate against.
+ */
+ @Child(name = "validateProfileId", type = {IdType.class}, order=15, min=0, max=1)
+ @Description(shortDefinition="Validate Profile Id", formalDefinition="The ID of the Profile to validate against." )
+ protected IdType validateProfileId;
+
+ /**
+ * The value to compare to.
+ */
+ @Child(name = "value", type = {StringType.class}, order=16, min=0, max=1)
+ @Description(shortDefinition="The value to compare to", formalDefinition="The value to compare to." )
+ protected StringType value;
+
+ /**
+ * Warning Only.
+ */
+ @Child(name = "warningOnly", type = {BooleanType.class}, order=17, min=0, max=1)
+ @Description(shortDefinition="Warning Only", formalDefinition="Warning Only." )
+ protected BooleanType warningOnly;
+
+ private static final long serialVersionUID = -1173819305L;
+
+ /*
+ * Constructor
+ */
+ public TestScriptSetupActionAssertComponent() {
+ super();
+ }
+
+ /**
+ * @return {@link #label} (The label would be used for tracking/logging purposes by test engines.). This is the underlying object with id, value and extensions. The accessor "getLabel" gives direct access to the value
+ */
+ public StringType getLabelElement() {
+ if (this.label == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.label");
+ else if (Configuration.doAutoCreate())
+ this.label = new StringType(); // bb
+ return this.label;
+ }
+
+ public boolean hasLabelElement() {
+ return this.label != null && !this.label.isEmpty();
+ }
+
+ public boolean hasLabel() {
+ return this.label != null && !this.label.isEmpty();
+ }
+
+ /**
+ * @param value {@link #label} (The label would be used for tracking/logging purposes by test engines.). This is the underlying object with id, value and extensions. The accessor "getLabel" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setLabelElement(StringType value) {
+ this.label = value;
+ return this;
+ }
+
+ /**
+ * @return The label would be used for tracking/logging purposes by test engines.
+ */
+ public String getLabel() {
+ return this.label == null ? null : this.label.getValue();
+ }
+
+ /**
+ * @param value The label would be used for tracking/logging purposes by test engines.
+ */
+ public TestScriptSetupActionAssertComponent setLabel(String value) {
+ if (Utilities.noString(value))
+ this.label = null;
+ else {
+ if (this.label == null)
+ this.label = new StringType();
+ this.label.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #description} (The description would be used by test engines for tracking and reporting purposes.). 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 TestScriptSetupActionAssertComponent.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} (The description would be used by test engines for tracking and reporting purposes.). This is the underlying object with id, value and extensions. The accessor "getDescription" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setDescriptionElement(StringType value) {
+ this.description = value;
+ return this;
+ }
+
+ /**
+ * @return The description would be used by test engines for tracking and reporting purposes.
+ */
+ public String getDescription() {
+ return this.description == null ? null : this.description.getValue();
+ }
+
+ /**
+ * @param value The description would be used by test engines for tracking and reporting purposes.
+ */
+ public TestScriptSetupActionAssertComponent 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;
+ }
+
+ /**
+ * @return {@link #compareToSourceId} (Id of fixture used to compare the "sourceId/path" evaluations to.). This is the underlying object with id, value and extensions. The accessor "getCompareToSourceId" gives direct access to the value
+ */
+ public StringType getCompareToSourceIdElement() {
+ if (this.compareToSourceId == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.compareToSourceId");
+ else if (Configuration.doAutoCreate())
+ this.compareToSourceId = new StringType(); // bb
+ return this.compareToSourceId;
+ }
+
+ public boolean hasCompareToSourceIdElement() {
+ return this.compareToSourceId != null && !this.compareToSourceId.isEmpty();
+ }
+
+ public boolean hasCompareToSourceId() {
+ return this.compareToSourceId != null && !this.compareToSourceId.isEmpty();
+ }
+
+ /**
+ * @param value {@link #compareToSourceId} (Id of fixture used to compare the "sourceId/path" evaluations to.). This is the underlying object with id, value and extensions. The accessor "getCompareToSourceId" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setCompareToSourceIdElement(StringType value) {
+ this.compareToSourceId = value;
+ return this;
+ }
+
+ /**
+ * @return Id of fixture used to compare the "sourceId/path" evaluations to.
+ */
+ public String getCompareToSourceId() {
+ return this.compareToSourceId == null ? null : this.compareToSourceId.getValue();
+ }
+
+ /**
+ * @param value Id of fixture used to compare the "sourceId/path" evaluations to.
+ */
+ public TestScriptSetupActionAssertComponent setCompareToSourceId(String value) {
+ if (Utilities.noString(value))
+ this.compareToSourceId = null;
+ else {
+ if (this.compareToSourceId == null)
+ this.compareToSourceId = new StringType();
+ this.compareToSourceId.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #compareToSourcePath} (XPath or JSONPath expression against fixture used to compare the "sourceId/path" evaluations to.). This is the underlying object with id, value and extensions. The accessor "getCompareToSourcePath" gives direct access to the value
+ */
+ public StringType getCompareToSourcePathElement() {
+ if (this.compareToSourcePath == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.compareToSourcePath");
+ else if (Configuration.doAutoCreate())
+ this.compareToSourcePath = new StringType(); // bb
+ return this.compareToSourcePath;
+ }
+
+ public boolean hasCompareToSourcePathElement() {
+ return this.compareToSourcePath != null && !this.compareToSourcePath.isEmpty();
+ }
+
+ public boolean hasCompareToSourcePath() {
+ return this.compareToSourcePath != null && !this.compareToSourcePath.isEmpty();
+ }
+
+ /**
+ * @param value {@link #compareToSourcePath} (XPath or JSONPath expression against fixture used to compare the "sourceId/path" evaluations to.). This is the underlying object with id, value and extensions. The accessor "getCompareToSourcePath" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setCompareToSourcePathElement(StringType value) {
+ this.compareToSourcePath = value;
+ return this;
+ }
+
+ /**
+ * @return XPath or JSONPath expression against fixture used to compare the "sourceId/path" evaluations to.
+ */
+ public String getCompareToSourcePath() {
+ return this.compareToSourcePath == null ? null : this.compareToSourcePath.getValue();
+ }
+
+ /**
+ * @param value XPath or JSONPath expression against fixture used to compare the "sourceId/path" evaluations to.
+ */
+ public TestScriptSetupActionAssertComponent setCompareToSourcePath(String value) {
+ if (Utilities.noString(value))
+ this.compareToSourcePath = null;
+ else {
+ if (this.compareToSourcePath == null)
+ this.compareToSourcePath = new StringType();
+ this.compareToSourcePath.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #contentType} (The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.). This is the underlying object with id, value and extensions. The accessor "getContentType" gives direct access to the value
*/
public Enumeration getContentTypeElement() {
if (this.contentType == null)
if (Configuration.errorOnAutoCreate())
- throw new Error("Attempt to auto-create TestScriptSetupOperationComponent.contentType");
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.contentType");
else if (Configuration.doAutoCreate())
this.contentType = new Enumeration(new ContentTypeEnumFactory()); // bb
return this.contentType;
@@ -1098,24 +3496,24 @@ public class TestScript extends DomainResource {
}
/**
- * @param value {@link #contentType} (The content-type or mime-type to use for RESTful operation.). This is the underlying object with id, value and extensions. The accessor "getContentType" gives direct access to the value
+ * @param value {@link #contentType} (The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.). This is the underlying object with id, value and extensions. The accessor "getContentType" gives direct access to the value
*/
- public TestScriptSetupOperationComponent setContentTypeElement(Enumeration value) {
+ public TestScriptSetupActionAssertComponent setContentTypeElement(Enumeration value) {
this.contentType = value;
return this;
}
/**
- * @return The content-type or mime-type to use for RESTful operation.
+ * @return The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.
*/
public ContentType getContentType() {
return this.contentType == null ? null : this.contentType.getValue();
}
/**
- * @param value The content-type or mime-type to use for RESTful operation.
+ * @param value The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.
*/
- public TestScriptSetupOperationComponent setContentType(ContentType value) {
+ public TestScriptSetupActionAssertComponent setContentType(ContentType value) {
if (value == null)
this.contentType = null;
else {
@@ -1126,31 +3524,627 @@ public class TestScript extends DomainResource {
return this;
}
- protected void listChildren(List childrenList) {
- super.listChildren(childrenList);
- childrenList.add(new Property("type", "code", "read | vread | update | delete | history | create | search | transaction | conformance | tags | mailbox | document | assertion | assertion_false | assertion_warning.", 0, java.lang.Integer.MAX_VALUE, type));
- childrenList.add(new Property("source", "id", "The internal id of the fixture used as the body of any operation.type that results in a PUT or POST.", 0, java.lang.Integer.MAX_VALUE, source));
- childrenList.add(new Property("target", "id", "The id of the fixture used as the target of any operation.type that results in a PUT or POST, or the id of the fixture used to store the results of a GET.", 0, java.lang.Integer.MAX_VALUE, target));
- childrenList.add(new Property("destination", "integer", "Which server to perform the operation on.", 0, java.lang.Integer.MAX_VALUE, destination));
- childrenList.add(new Property("parameter", "string", "Arguments to an operation.", 0, java.lang.Integer.MAX_VALUE, parameter));
- childrenList.add(new Property("responseId", "id", "The fixture id (maybe new) to map to the response.", 0, java.lang.Integer.MAX_VALUE, responseId));
- childrenList.add(new Property("contentType", "code", "The content-type or mime-type to use for RESTful operation.", 0, java.lang.Integer.MAX_VALUE, contentType));
+ /**
+ * @return {@link #headerField} (The header field e.g. 'Content-Location'.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value
+ */
+ public StringType getHeaderFieldElement() {
+ if (this.headerField == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.headerField");
+ else if (Configuration.doAutoCreate())
+ this.headerField = new StringType(); // bb
+ return this.headerField;
}
- public TestScriptSetupOperationComponent copy() {
- TestScriptSetupOperationComponent dst = new TestScriptSetupOperationComponent();
+ public boolean hasHeaderFieldElement() {
+ return this.headerField != null && !this.headerField.isEmpty();
+ }
+
+ public boolean hasHeaderField() {
+ return this.headerField != null && !this.headerField.isEmpty();
+ }
+
+ /**
+ * @param value {@link #headerField} (The header field e.g. 'Content-Location'.). This is the underlying object with id, value and extensions. The accessor "getHeaderField" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setHeaderFieldElement(StringType value) {
+ this.headerField = value;
+ return this;
+ }
+
+ /**
+ * @return The header field e.g. 'Content-Location'.
+ */
+ public String getHeaderField() {
+ return this.headerField == null ? null : this.headerField.getValue();
+ }
+
+ /**
+ * @param value The header field e.g. 'Content-Location'.
+ */
+ public TestScriptSetupActionAssertComponent setHeaderField(String value) {
+ if (Utilities.noString(value))
+ this.headerField = null;
+ else {
+ if (this.headerField == null)
+ this.headerField = new StringType();
+ this.headerField.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #minimumId} (The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId.). This is the underlying object with id, value and extensions. The accessor "getMinimumId" gives direct access to the value
+ */
+ public StringType getMinimumIdElement() {
+ if (this.minimumId == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.minimumId");
+ else if (Configuration.doAutoCreate())
+ this.minimumId = new StringType(); // bb
+ return this.minimumId;
+ }
+
+ public boolean hasMinimumIdElement() {
+ return this.minimumId != null && !this.minimumId.isEmpty();
+ }
+
+ public boolean hasMinimumId() {
+ return this.minimumId != null && !this.minimumId.isEmpty();
+ }
+
+ /**
+ * @param value {@link #minimumId} (The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId.). This is the underlying object with id, value and extensions. The accessor "getMinimumId" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setMinimumIdElement(StringType value) {
+ this.minimumId = value;
+ return this;
+ }
+
+ /**
+ * @return The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId.
+ */
+ public String getMinimumId() {
+ return this.minimumId == null ? null : this.minimumId.getValue();
+ }
+
+ /**
+ * @param value The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId.
+ */
+ public TestScriptSetupActionAssertComponent setMinimumId(String value) {
+ if (Utilities.noString(value))
+ this.minimumId = null;
+ else {
+ if (this.minimumId == null)
+ this.minimumId = new StringType();
+ this.minimumId.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #navigationLinks} (Navigation Links.). This is the underlying object with id, value and extensions. The accessor "getNavigationLinks" gives direct access to the value
+ */
+ public BooleanType getNavigationLinksElement() {
+ if (this.navigationLinks == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.navigationLinks");
+ else if (Configuration.doAutoCreate())
+ this.navigationLinks = new BooleanType(); // bb
+ return this.navigationLinks;
+ }
+
+ public boolean hasNavigationLinksElement() {
+ return this.navigationLinks != null && !this.navigationLinks.isEmpty();
+ }
+
+ public boolean hasNavigationLinks() {
+ return this.navigationLinks != null && !this.navigationLinks.isEmpty();
+ }
+
+ /**
+ * @param value {@link #navigationLinks} (Navigation Links.). This is the underlying object with id, value and extensions. The accessor "getNavigationLinks" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setNavigationLinksElement(BooleanType value) {
+ this.navigationLinks = value;
+ return this;
+ }
+
+ /**
+ * @return Navigation Links.
+ */
+ public boolean getNavigationLinks() {
+ return this.navigationLinks == null || this.navigationLinks.isEmpty() ? false : this.navigationLinks.getValue();
+ }
+
+ /**
+ * @param value Navigation Links.
+ */
+ public TestScriptSetupActionAssertComponent setNavigationLinks(boolean value) {
+ if (this.navigationLinks == null)
+ this.navigationLinks = new BooleanType();
+ this.navigationLinks.setValue(value);
+ return this;
+ }
+
+ /**
+ * @return {@link #operator} (The operator type.). This is the underlying object with id, value and extensions. The accessor "getOperator" gives direct access to the value
+ */
+ public Enumeration getOperatorElement() {
+ if (this.operator == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.operator");
+ else if (Configuration.doAutoCreate())
+ this.operator = new Enumeration(new AssertionOperatorTypeEnumFactory()); // bb
+ return this.operator;
+ }
+
+ public boolean hasOperatorElement() {
+ return this.operator != null && !this.operator.isEmpty();
+ }
+
+ public boolean hasOperator() {
+ return this.operator != null && !this.operator.isEmpty();
+ }
+
+ /**
+ * @param value {@link #operator} (The operator type.). This is the underlying object with id, value and extensions. The accessor "getOperator" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setOperatorElement(Enumeration value) {
+ this.operator = value;
+ return this;
+ }
+
+ /**
+ * @return The operator type.
+ */
+ public AssertionOperatorType getOperator() {
+ return this.operator == null ? null : this.operator.getValue();
+ }
+
+ /**
+ * @param value The operator type.
+ */
+ public TestScriptSetupActionAssertComponent setOperator(AssertionOperatorType value) {
+ if (value == null)
+ this.operator = null;
+ else {
+ if (this.operator == null)
+ this.operator = new Enumeration(new AssertionOperatorTypeEnumFactory());
+ this.operator.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #path} (The XPath or JSONPath expression to be evaluated against the fixture representing the response received from server.). This is the underlying object with id, value and extensions. The accessor "getPath" gives direct access to the value
+ */
+ public StringType getPathElement() {
+ if (this.path == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.path");
+ else if (Configuration.doAutoCreate())
+ this.path = new StringType(); // bb
+ return this.path;
+ }
+
+ public boolean hasPathElement() {
+ return this.path != null && !this.path.isEmpty();
+ }
+
+ public boolean hasPath() {
+ return this.path != null && !this.path.isEmpty();
+ }
+
+ /**
+ * @param value {@link #path} (The XPath or JSONPath expression to be evaluated against the fixture representing the response received from server.). This is the underlying object with id, value and extensions. The accessor "getPath" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setPathElement(StringType value) {
+ this.path = value;
+ return this;
+ }
+
+ /**
+ * @return The XPath or JSONPath expression to be evaluated against the fixture representing the response received from server.
+ */
+ public String getPath() {
+ return this.path == null ? null : this.path.getValue();
+ }
+
+ /**
+ * @param value The XPath or JSONPath expression to be evaluated against the fixture representing the response received from server.
+ */
+ public TestScriptSetupActionAssertComponent setPath(String value) {
+ if (Utilities.noString(value))
+ this.path = null;
+ else {
+ if (this.path == null)
+ this.path = new StringType();
+ this.path.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #resource} (The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.). This is the underlying object with id, value and extensions. The accessor "getResource" gives direct access to the value
+ */
+ public CodeType getResourceElement() {
+ if (this.resource == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.resource");
+ else if (Configuration.doAutoCreate())
+ this.resource = new CodeType(); // bb
+ return this.resource;
+ }
+
+ public boolean hasResourceElement() {
+ return this.resource != null && !this.resource.isEmpty();
+ }
+
+ public boolean hasResource() {
+ return this.resource != null && !this.resource.isEmpty();
+ }
+
+ /**
+ * @param value {@link #resource} (The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.). This is the underlying object with id, value and extensions. The accessor "getResource" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setResourceElement(CodeType value) {
+ this.resource = value;
+ return this;
+ }
+
+ /**
+ * @return The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.
+ */
+ public String getResource() {
+ return this.resource == null ? null : this.resource.getValue();
+ }
+
+ /**
+ * @param value The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.
+ */
+ public TestScriptSetupActionAssertComponent setResource(String value) {
+ if (Utilities.noString(value))
+ this.resource = null;
+ else {
+ if (this.resource == null)
+ this.resource = new CodeType();
+ this.resource.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #response} (okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable.). This is the underlying object with id, value and extensions. The accessor "getResponse" gives direct access to the value
+ */
+ public Enumeration getResponseElement() {
+ if (this.response == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.response");
+ else if (Configuration.doAutoCreate())
+ this.response = new Enumeration(new AssertionResponseTypesEnumFactory()); // bb
+ return this.response;
+ }
+
+ public boolean hasResponseElement() {
+ return this.response != null && !this.response.isEmpty();
+ }
+
+ public boolean hasResponse() {
+ return this.response != null && !this.response.isEmpty();
+ }
+
+ /**
+ * @param value {@link #response} (okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable.). This is the underlying object with id, value and extensions. The accessor "getResponse" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setResponseElement(Enumeration value) {
+ this.response = value;
+ return this;
+ }
+
+ /**
+ * @return okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable.
+ */
+ public AssertionResponseTypes getResponse() {
+ return this.response == null ? null : this.response.getValue();
+ }
+
+ /**
+ * @param value okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable.
+ */
+ public TestScriptSetupActionAssertComponent setResponse(AssertionResponseTypes value) {
+ if (value == null)
+ this.response = null;
+ else {
+ if (this.response == null)
+ this.response = new Enumeration(new AssertionResponseTypesEnumFactory());
+ this.response.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #responseCode} (HTTP Response Code.). This is the underlying object with id, value and extensions. The accessor "getResponseCode" gives direct access to the value
+ */
+ public StringType getResponseCodeElement() {
+ if (this.responseCode == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.responseCode");
+ else if (Configuration.doAutoCreate())
+ this.responseCode = new StringType(); // bb
+ return this.responseCode;
+ }
+
+ public boolean hasResponseCodeElement() {
+ return this.responseCode != null && !this.responseCode.isEmpty();
+ }
+
+ public boolean hasResponseCode() {
+ return this.responseCode != null && !this.responseCode.isEmpty();
+ }
+
+ /**
+ * @param value {@link #responseCode} (HTTP Response Code.). This is the underlying object with id, value and extensions. The accessor "getResponseCode" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setResponseCodeElement(StringType value) {
+ this.responseCode = value;
+ return this;
+ }
+
+ /**
+ * @return HTTP Response Code.
+ */
+ public String getResponseCode() {
+ return this.responseCode == null ? null : this.responseCode.getValue();
+ }
+
+ /**
+ * @param value HTTP Response Code.
+ */
+ public TestScriptSetupActionAssertComponent setResponseCode(String value) {
+ if (Utilities.noString(value))
+ this.responseCode = null;
+ else {
+ if (this.responseCode == null)
+ this.responseCode = new StringType();
+ this.responseCode.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #sourceId} (Fixture to evaluate the XPath/JSONPath expression or the headerField against.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value
+ */
+ public IdType getSourceIdElement() {
+ if (this.sourceId == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.sourceId");
+ else if (Configuration.doAutoCreate())
+ this.sourceId = new IdType(); // bb
+ return this.sourceId;
+ }
+
+ public boolean hasSourceIdElement() {
+ return this.sourceId != null && !this.sourceId.isEmpty();
+ }
+
+ public boolean hasSourceId() {
+ return this.sourceId != null && !this.sourceId.isEmpty();
+ }
+
+ /**
+ * @param value {@link #sourceId} (Fixture to evaluate the XPath/JSONPath expression or the headerField against.). This is the underlying object with id, value and extensions. The accessor "getSourceId" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setSourceIdElement(IdType value) {
+ this.sourceId = value;
+ return this;
+ }
+
+ /**
+ * @return Fixture to evaluate the XPath/JSONPath expression or the headerField against.
+ */
+ public String getSourceId() {
+ return this.sourceId == null ? null : this.sourceId.getValue();
+ }
+
+ /**
+ * @param value Fixture to evaluate the XPath/JSONPath expression or the headerField against.
+ */
+ public TestScriptSetupActionAssertComponent setSourceId(String value) {
+ if (Utilities.noString(value))
+ this.sourceId = null;
+ else {
+ if (this.sourceId == null)
+ this.sourceId = new IdType();
+ this.sourceId.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #validateProfileId} (The ID of the Profile to validate against.). This is the underlying object with id, value and extensions. The accessor "getValidateProfileId" gives direct access to the value
+ */
+ public IdType getValidateProfileIdElement() {
+ if (this.validateProfileId == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.validateProfileId");
+ else if (Configuration.doAutoCreate())
+ this.validateProfileId = new IdType(); // bb
+ return this.validateProfileId;
+ }
+
+ public boolean hasValidateProfileIdElement() {
+ return this.validateProfileId != null && !this.validateProfileId.isEmpty();
+ }
+
+ public boolean hasValidateProfileId() {
+ return this.validateProfileId != null && !this.validateProfileId.isEmpty();
+ }
+
+ /**
+ * @param value {@link #validateProfileId} (The ID of the Profile to validate against.). This is the underlying object with id, value and extensions. The accessor "getValidateProfileId" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setValidateProfileIdElement(IdType value) {
+ this.validateProfileId = value;
+ return this;
+ }
+
+ /**
+ * @return The ID of the Profile to validate against.
+ */
+ public String getValidateProfileId() {
+ return this.validateProfileId == null ? null : this.validateProfileId.getValue();
+ }
+
+ /**
+ * @param value The ID of the Profile to validate against.
+ */
+ public TestScriptSetupActionAssertComponent setValidateProfileId(String value) {
+ if (Utilities.noString(value))
+ this.validateProfileId = null;
+ else {
+ if (this.validateProfileId == null)
+ this.validateProfileId = new IdType();
+ this.validateProfileId.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #value} (The value to compare to.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public StringType getValueElement() {
+ if (this.value == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.value");
+ else if (Configuration.doAutoCreate())
+ this.value = new StringType(); // bb
+ return this.value;
+ }
+
+ public boolean hasValueElement() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ public boolean hasValue() {
+ return this.value != null && !this.value.isEmpty();
+ }
+
+ /**
+ * @param value {@link #value} (The value to compare to.). This is the underlying object with id, value and extensions. The accessor "getValue" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setValueElement(StringType value) {
+ this.value = value;
+ return this;
+ }
+
+ /**
+ * @return The value to compare to.
+ */
+ public String getValue() {
+ return this.value == null ? null : this.value.getValue();
+ }
+
+ /**
+ * @param value The value to compare to.
+ */
+ public TestScriptSetupActionAssertComponent setValue(String value) {
+ if (Utilities.noString(value))
+ this.value = null;
+ else {
+ if (this.value == null)
+ this.value = new StringType();
+ this.value.setValue(value);
+ }
+ return this;
+ }
+
+ /**
+ * @return {@link #warningOnly} (Warning Only.). This is the underlying object with id, value and extensions. The accessor "getWarningOnly" gives direct access to the value
+ */
+ public BooleanType getWarningOnlyElement() {
+ if (this.warningOnly == null)
+ if (Configuration.errorOnAutoCreate())
+ throw new Error("Attempt to auto-create TestScriptSetupActionAssertComponent.warningOnly");
+ else if (Configuration.doAutoCreate())
+ this.warningOnly = new BooleanType(); // bb
+ return this.warningOnly;
+ }
+
+ public boolean hasWarningOnlyElement() {
+ return this.warningOnly != null && !this.warningOnly.isEmpty();
+ }
+
+ public boolean hasWarningOnly() {
+ return this.warningOnly != null && !this.warningOnly.isEmpty();
+ }
+
+ /**
+ * @param value {@link #warningOnly} (Warning Only.). This is the underlying object with id, value and extensions. The accessor "getWarningOnly" gives direct access to the value
+ */
+ public TestScriptSetupActionAssertComponent setWarningOnlyElement(BooleanType value) {
+ this.warningOnly = value;
+ return this;
+ }
+
+ /**
+ * @return Warning Only.
+ */
+ public boolean getWarningOnly() {
+ return this.warningOnly == null || this.warningOnly.isEmpty() ? false : this.warningOnly.getValue();
+ }
+
+ /**
+ * @param value Warning Only.
+ */
+ public TestScriptSetupActionAssertComponent setWarningOnly(boolean value) {
+ if (this.warningOnly == null)
+ this.warningOnly = new BooleanType();
+ this.warningOnly.setValue(value);
+ return this;
+ }
+
+ protected void listChildren(List childrenList) {
+ super.listChildren(childrenList);
+ childrenList.add(new Property("label", "string", "The label would be used for tracking/logging purposes by test engines.", 0, java.lang.Integer.MAX_VALUE, label));
+ childrenList.add(new Property("description", "string", "The description would be used by test engines for tracking and reporting purposes.", 0, java.lang.Integer.MAX_VALUE, description));
+ childrenList.add(new Property("compareToSourceId", "string", "Id of fixture used to compare the 'sourceId/path' evaluations to.", 0, java.lang.Integer.MAX_VALUE, compareToSourceId));
+ childrenList.add(new Property("compareToSourcePath", "string", "XPath or JSONPath expression against fixture used to compare the 'sourceId/path' evaluations to.", 0, java.lang.Integer.MAX_VALUE, compareToSourcePath));
+ childrenList.add(new Property("contentType", "code", "The content-type or mime-type to use for RESTful operation in the 'Content-Type' header.", 0, java.lang.Integer.MAX_VALUE, contentType));
+ childrenList.add(new Property("headerField", "string", "The header field e.g. 'Content-Location'.", 0, java.lang.Integer.MAX_VALUE, headerField));
+ childrenList.add(new Property("minimumId", "string", "The ID of a fixture. Asserts that the response contains at a minimumId the fixture specified by minimumId.", 0, java.lang.Integer.MAX_VALUE, minimumId));
+ childrenList.add(new Property("navigationLinks", "boolean", "Navigation Links.", 0, java.lang.Integer.MAX_VALUE, navigationLinks));
+ childrenList.add(new Property("operator", "code", "The operator type.", 0, java.lang.Integer.MAX_VALUE, operator));
+ childrenList.add(new Property("path", "string", "The XPath or JSONPath expression to be evaluated against the fixture representing the response received from server.", 0, java.lang.Integer.MAX_VALUE, path));
+ childrenList.add(new Property("resource", "code", "The type of the resource. See http://hl7-fhir.github.io/resourcelist.html.", 0, java.lang.Integer.MAX_VALUE, resource));
+ childrenList.add(new Property("response", "code", "okay | created | noContent | notModified | bad | forbidden | notFound | methodNotAllowed | conflict | gone | preconditionFailed | unprocessable.", 0, java.lang.Integer.MAX_VALUE, response));
+ childrenList.add(new Property("responseCode", "string", "HTTP Response Code.", 0, java.lang.Integer.MAX_VALUE, responseCode));
+ childrenList.add(new Property("sourceId", "id", "Fixture to evaluate the XPath/JSONPath expression or the headerField against.", 0, java.lang.Integer.MAX_VALUE, sourceId));
+ childrenList.add(new Property("validateProfileId", "id", "The ID of the Profile to validate against.", 0, java.lang.Integer.MAX_VALUE, validateProfileId));
+ childrenList.add(new Property("value", "string", "The value to compare to.", 0, java.lang.Integer.MAX_VALUE, value));
+ childrenList.add(new Property("warningOnly", "boolean", "Warning Only.", 0, java.lang.Integer.MAX_VALUE, warningOnly));
+ }
+
+ public TestScriptSetupActionAssertComponent copy() {
+ TestScriptSetupActionAssertComponent dst = new TestScriptSetupActionAssertComponent();
copyValues(dst);
- dst.type = type == null ? null : type.copy();
- dst.source = source == null ? null : source.copy();
- dst.target = target == null ? null : target.copy();
- dst.destination = destination == null ? null : destination.copy();
- if (parameter != null) {
- dst.parameter = new ArrayList();
- for (StringType i : parameter)
- dst.parameter.add(i.copy());
- };
- dst.responseId = responseId == null ? null : responseId.copy();
+ dst.label = label == null ? null : label.copy();
+ dst.description = description == null ? null : description.copy();
+ dst.compareToSourceId = compareToSourceId == null ? null : compareToSourceId.copy();
+ dst.compareToSourcePath = compareToSourcePath == null ? null : compareToSourcePath.copy();
dst.contentType = contentType == null ? null : contentType.copy();
+ dst.headerField = headerField == null ? null : headerField.copy();
+ dst.minimumId = minimumId == null ? null : minimumId.copy();
+ dst.navigationLinks = navigationLinks == null ? null : navigationLinks.copy();
+ dst.operator = operator == null ? null : operator.copy();
+ dst.path = path == null ? null : path.copy();
+ dst.resource = resource == null ? null : resource.copy();
+ dst.response = response == null ? null : response.copy();
+ dst.responseCode = responseCode == null ? null : responseCode.copy();
+ dst.sourceId = sourceId == null ? null : sourceId.copy();
+ dst.validateProfileId = validateProfileId == null ? null : validateProfileId.copy();
+ dst.value = value == null ? null : value.copy();
+ dst.warningOnly = warningOnly == null ? null : warningOnly.copy();
return dst;
}
@@ -1158,31 +4152,43 @@ public class TestScript extends DomainResource {
public boolean equalsDeep(Base other) {
if (!super.equalsDeep(other))
return false;
- if (!(other instanceof TestScriptSetupOperationComponent))
+ if (!(other instanceof TestScriptSetupActionAssertComponent))
return false;
- TestScriptSetupOperationComponent o = (TestScriptSetupOperationComponent) other;
- return compareDeep(type, o.type, true) && compareDeep(source, o.source, true) && compareDeep(target, o.target, true)
- && compareDeep(destination, o.destination, true) && compareDeep(parameter, o.parameter, true) && compareDeep(responseId, o.responseId, true)
- && compareDeep(contentType, o.contentType, true);
+ TestScriptSetupActionAssertComponent o = (TestScriptSetupActionAssertComponent) other;
+ return compareDeep(label, o.label, true) && compareDeep(description, o.description, true) && compareDeep(compareToSourceId, o.compareToSourceId, true)
+ && compareDeep(compareToSourcePath, o.compareToSourcePath, true) && compareDeep(contentType, o.contentType, true)
+ && compareDeep(headerField, o.headerField, true) && compareDeep(minimumId, o.minimumId, true) && compareDeep(navigationLinks, o.navigationLinks, true)
+ && compareDeep(operator, o.operator, true) && compareDeep(path, o.path, true) && compareDeep(resource, o.resource, true)
+ && compareDeep(response, o.response, true) && compareDeep(responseCode, o.responseCode, true) && compareDeep(sourceId, o.sourceId, true)
+ && compareDeep(validateProfileId, o.validateProfileId, true) && compareDeep(value, o.value, true)
+ && compareDeep(warningOnly, o.warningOnly, true);
}
@Override
public boolean equalsShallow(Base other) {
if (!super.equalsShallow(other))
return false;
- if (!(other instanceof TestScriptSetupOperationComponent))
+ if (!(other instanceof TestScriptSetupActionAssertComponent))
return false;
- TestScriptSetupOperationComponent o = (TestScriptSetupOperationComponent) other;
- return compareValues(type, o.type, true) && compareValues(source, o.source, true) && compareValues(target, o.target, true)
- && compareValues(destination, o.destination, true) && compareValues(parameter, o.parameter, true) && compareValues(responseId, o.responseId, true)
- && compareValues(contentType, o.contentType, true);
+ TestScriptSetupActionAssertComponent o = (TestScriptSetupActionAssertComponent) other;
+ return compareValues(label, o.label, true) && compareValues(description, o.description, true) && compareValues(compareToSourceId, o.compareToSourceId, true)
+ && compareValues(compareToSourcePath, o.compareToSourcePath, true) && compareValues(contentType, o.contentType, true)
+ && compareValues(headerField, o.headerField, true) && compareValues(minimumId, o.minimumId, true) && compareValues(navigationLinks, o.navigationLinks, true)
+ && compareValues(operator, o.operator, true) && compareValues(path, o.path, true) && compareValues(resource, o.resource, true)
+ && compareValues(response, o.response, true) && compareValues(responseCode, o.responseCode, true) && compareValues(sourceId, o.sourceId, true)
+ && compareValues(validateProfileId, o.validateProfileId, true) && compareValues(value, o.value, true)
+ && compareValues(warningOnly, o.warningOnly, true);
}
public boolean isEmpty() {
- return super.isEmpty() && (type == null || type.isEmpty()) && (source == null || source.isEmpty())
- && (target == null || target.isEmpty()) && (destination == null || destination.isEmpty())
- && (parameter == null || parameter.isEmpty()) && (responseId == null || responseId.isEmpty())
- && (contentType == null || contentType.isEmpty());
+ return super.isEmpty() && (label == null || label.isEmpty()) && (description == null || description.isEmpty())
+ && (compareToSourceId == null || compareToSourceId.isEmpty()) && (compareToSourcePath == null || compareToSourcePath.isEmpty())
+ && (contentType == null || contentType.isEmpty()) && (headerField == null || headerField.isEmpty())
+ && (minimumId == null || minimumId.isEmpty()) && (navigationLinks == null || navigationLinks.isEmpty())
+ && (operator == null || operator.isEmpty()) && (path == null || path.isEmpty()) && (resource == null || resource.isEmpty())
+ && (response == null || response.isEmpty()) && (responseCode == null || responseCode.isEmpty())
+ && (sourceId == null || sourceId.isEmpty()) && (validateProfileId == null || validateProfileId.isEmpty())
+ && (value == null || value.isEmpty()) && (warningOnly == null || warningOnly.isEmpty());
}
}
@@ -1204,20 +4210,20 @@ public class TestScript extends DomainResource {
protected StringType description;
/**
- * Metadata about this Test.
+ * Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.
*/
- @Child(name = "metadata", type = {}, order=3, min=0, max=1)
- @Description(shortDefinition="Metadata about this Test", formalDefinition="Metadata about this Test." )
- protected TestScriptTestMetadataComponent metadata;
+ @Child(name = "metadata", type = {TestScriptMetadataComponent.class}, order=3, min=0, max=1)
+ @Description(shortDefinition="Capabiltities that are assumed to function correctly on the FHIR server being tested", formalDefinition="Capabilties that must exist and is assumed to function correctly on the FHIR server being tested." )
+ protected TestScriptMetadataComponent metadata;
/**
- * Each test must have at least one operation. Operation and assertion elements can be mixed together.
+ * Action would contain either an operation or an assertion.
*/
- @Child(name = "operation", type = {}, order=4, min=1, max=Child.MAX_UNLIMITED)
- @Description(shortDefinition="Each test must have at least one operation", formalDefinition="Each test must have at least one operation. Operation and assertion elements can be mixed together." )
- protected List operation;
+ @Child(name = "action", type = {}, order=4, min=1, max=Child.MAX_UNLIMITED)
+ @Description(shortDefinition="Action", formalDefinition="Action would contain either an operation or an assertion." )
+ protected List action;
- private static final long serialVersionUID = -84782237L;
+ private static final long serialVersionUID = 408339297L;
/*
* Constructor
@@ -1325,14 +4331,14 @@ public class TestScript extends DomainResource {
}
/**
- * @return {@link #metadata} (Metadata about this Test.)
+ * @return {@link #metadata} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.)
*/
- public TestScriptTestMetadataComponent getMetadata() {
+ public TestScriptMetadataComponent getMetadata() {
if (this.metadata == null)
if (Configuration.errorOnAutoCreate())
throw new Error("Attempt to auto-create TestScriptTestComponent.metadata");
else if (Configuration.doAutoCreate())
- this.metadata = new TestScriptTestMetadataComponent(); // cc
+ this.metadata = new TestScriptMetadataComponent(); // cc
return this.metadata;
}
@@ -1341,50 +4347,50 @@ public class TestScript extends DomainResource {
}
/**
- * @param value {@link #metadata} (Metadata about this Test.)
+ * @param value {@link #metadata} (Capabilties that must exist and is assumed to function correctly on the FHIR server being tested.)
*/
- public TestScriptTestComponent setMetadata(TestScriptTestMetadataComponent value) {
+ public TestScriptTestComponent setMetadata(TestScriptMetadataComponent value) {
this.metadata = value;
return this;
}
/**
- * @return {@link #operation} (Each test must have at least one operation. Operation and assertion elements can be mixed together.)
+ * @return {@link #action} (Action would contain either an operation or an assertion.)
*/
- public List getOperation() {
- if (this.operation == null)
- this.operation = new ArrayList();
- return this.operation;
+ public List