diff --git a/hapi-fhir-base/examples/src/main/java/example/GenericClientExample.java b/hapi-fhir-base/examples/src/main/java/example/GenericClientExample.java index 4805c3f3411..533899ae680 100644 --- a/hapi-fhir-base/examples/src/main/java/example/GenericClientExample.java +++ b/hapi-fhir-base/examples/src/main/java/example/GenericClientExample.java @@ -117,6 +117,14 @@ response = client.search() .execute(); //END SNIPPET: searchAnd +//START SNIPPET: searchCompartment +response = client.search() + .forResource(Patient.class) + .withIdAndCompartment("123", "condition") + .where(Patient.ADDRESS.matches().values("Toronto")) + .execute(); +//END SNIPPET: searchCompartment + //START SNIPPET: searchAdv response = client.search() .forResource(Patient.class) diff --git a/hapi-fhir-base/examples/src/main/java/example/RestfulPatientResourceProviderMore.java b/hapi-fhir-base/examples/src/main/java/example/RestfulPatientResourceProviderMore.java index 1bb652fbafd..fa925e6eb98 100644 --- a/hapi-fhir-base/examples/src/main/java/example/RestfulPatientResourceProviderMore.java +++ b/hapi-fhir-base/examples/src/main/java/example/RestfulPatientResourceProviderMore.java @@ -96,6 +96,15 @@ public List getAllOrganizations() { } //END SNIPPET: searchAll +//START SNIPPET: searchCompartment +@Search(compartmentName="fooCompartment") +public List searchCompartment(@IdParam IdDt theId) { + List retVal=new ArrayList(); // populate this + return retVal; +} +//END SNIPPET: searchCompartment + + //START SNIPPET: sort @Search public List findPatients( diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index eab3468fc2a..a863cf5c890 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -635,6 +635,7 @@ + diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java index a917d150cce..4de627af2c0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.context; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java index ffa5fa5fde8..bbda02ef310 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.context; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.InputStream; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java index c5e02eb133e..dea5b5f7725 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeChildDeclaredExtensionDefinition.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.context; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java index 4f49ffd5608..65feca3230e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeCompositeDatatypeDefinition.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.context; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import ca.uhn.fhir.model.api.ICompositeDatatype; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.ResourceDef; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java index 71f09c5527f..8a7fbbed3bb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimePrimitiveDatatypeDefinition.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.context; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java index 9e4db368fa0..557feae8a52 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java @@ -20,8 +20,7 @@ package ca.uhn.fhir.context; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; -import static org.apache.commons.lang3.StringUtils.join; +import static org.apache.commons.lang3.StringUtils.*; import java.util.ArrayList; import java.util.Collections; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java index cb609620008..b3bc6f7d75a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.model.api; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java index 3997550f8ca..1c7b572f982 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/ResourceMetadataKeyEnum.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.model.api; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.util.Date; import java.util.Map; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java index a238d27b832..6a8c6904859 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Tag.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.model.api; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.net.URI; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java index bc50b3b0bba..1a6a6046cfe 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AddressDt.java @@ -36,38 +36,18 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR AddressDt Datatype @@ -538,4 +518,4 @@ public class AddressDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java index 416999700da..0b5361057f7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/AttachmentDt.java @@ -36,35 +36,16 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; @@ -466,4 +447,4 @@ public class AttachmentDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java index 23ae553d6c5..9f358b4baca 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodeableConceptDt.java @@ -36,38 +36,15 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR CodeableConceptDt Datatype @@ -234,4 +211,4 @@ public class CodeableConceptDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java index 26e45b5cb38..7f9f4b1e7cf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java @@ -36,36 +36,16 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.base.composite.BaseCodingDt; import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; @@ -410,4 +390,4 @@ public class CodingDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java index c7399138e6c..6863159f5bc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ContactDt.java @@ -36,38 +36,20 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.SimpleSetter; import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR ContactDt Datatype @@ -316,4 +298,4 @@ public class ContactDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java index 76e4cb31d02..c1785cbd862 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java @@ -36,38 +36,18 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.base.composite.BaseHumanNameDt; import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR HumanNameDt Datatype @@ -589,4 +569,4 @@ public class HumanNameDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java index 39b90f613a3..b235c6b8bc5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java @@ -36,36 +36,18 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.SimpleSetter; +import ca.uhn.fhir.model.base.composite.BaseIdentifierDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; @@ -414,4 +396,4 @@ public class IdentifierDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java index 0c30d0ad253..e6bcd4ff20a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/PeriodDt.java @@ -36,38 +36,17 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR PeriodDt Datatype @@ -237,4 +216,4 @@ public class PeriodDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java index f248e216a13..06b7321e2dd 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/QuantityDt.java @@ -36,36 +36,19 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.SimpleSetter; +import ca.uhn.fhir.model.base.composite.BaseQuantityDt; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; @@ -450,4 +433,4 @@ public class QuantityDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java index cb3c7a557f6..8a23cb4785a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RangeDt.java @@ -36,38 +36,15 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR RangeDt Datatype @@ -341,4 +318,4 @@ public class RangeDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java index 4fba632f534..39850e81c07 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/RatioDt.java @@ -36,38 +36,15 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR RatioDt Datatype @@ -341,4 +318,4 @@ public class RatioDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java index eac0bea1d4d..4f0a2b479d4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ResourceReferenceDt.java @@ -36,38 +36,17 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IntegerDt; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt; +import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR ResourceReferenceDt Datatype @@ -248,4 +227,4 @@ public class ResourceReferenceDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java index a4d18778a23..d9b2483396a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/SampledDataDt.java @@ -36,38 +36,18 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR SampledDataDt Datatype @@ -635,4 +615,4 @@ public class SampledDataDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java index 91b62d1a9d8..e13545c60ca 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/ScheduleDt.java @@ -36,38 +36,25 @@ package ca.uhn.fhir.model.dstu.composite; * #L% */ -import java.math.BigDecimal; -import org.apache.commons.lang3.StringUtils; -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.primitive.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.model.base.composite.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.valueset.AddressUseEnum; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.ContactSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.NameUseEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.ICompositeDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResourceBlock; import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.dstu.valueset.EventTimingEnum; import ca.uhn.fhir.model.dstu.valueset.UnitsOfTimeEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** * HAPI/FHIR ScheduleDt Datatype @@ -585,4 +572,4 @@ public class ScheduleDt -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java index 3d980d6b5c4..b3583a7fbb5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java @@ -37,196 +37,35 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1138,4 +977,4 @@ public class AdverseReaction extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java index 9750b4e3a12..22fa576dda6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java @@ -37,196 +37,25 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; /** @@ -614,4 +443,4 @@ public class Alert extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java index 473ced4eb7e..af7d4a83ca9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java @@ -37,196 +37,30 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; +import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -951,4 +785,4 @@ public class AllergyIntolerance extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java index 79397ab6533..fc96dbf6bf9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java @@ -37,196 +37,37 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.composite.ScheduleDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1511,4 +1352,4 @@ public class Appointment extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java index d89da52e4a2..b946d191cb6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java @@ -37,196 +37,31 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.composite.ScheduleDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -1056,4 +891,4 @@ public class AppointmentResponse extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java index 79de423bfc3..5ec3dc3b750 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java @@ -37,196 +37,27 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -686,4 +517,4 @@ public class Availability extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java index 99ff8fcfffa..267dbaff32f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java @@ -37,196 +37,43 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.QuantityDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.composite.ScheduleDt; import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2309,4 +2156,4 @@ public class CarePlan extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java index 74d509fd704..c10a2de0974 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java @@ -37,196 +37,33 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2194,4 +2031,4 @@ public class Claim extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java index 7a7c6a52719..194be2b3843 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java @@ -37,196 +37,36 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.CodingDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1856,4 +1696,4 @@ public class Composition extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java index 7b60ebf69e0..78d7b84e1c1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java @@ -37,196 +37,36 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.ContactDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; +import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1988,4 +1828,4 @@ public class ConceptMap extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java index b926664af45..f97e2e988e0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java @@ -37,196 +37,37 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.AgeDt; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1934,4 +1775,4 @@ public class Condition extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java index bce9b2f16dc..2ff435af243 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java @@ -37,196 +37,50 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; +import ca.uhn.fhir.model.dstu.composite.ContactDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; import ca.uhn.fhir.model.primitive.Base64BinaryDt; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -5027,4 +4881,4 @@ public class Conformance extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java index 28baa63d13f..3247218e4ac 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java @@ -37,196 +37,32 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1138,4 +974,4 @@ public class Coverage extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java index 175ebe984bb..0d4d8e050e6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java @@ -37,196 +37,30 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.ContactDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1183,4 +1017,4 @@ public class Device extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java index 4e61d2cc5b2..c684abe000b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java @@ -37,196 +37,28 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -989,4 +821,4 @@ public class DeviceObservationReport extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java index 0dbd49e7f94..7542556caf7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java @@ -37,196 +37,35 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.CompositeClientParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1693,4 +1532,4 @@ public class DiagnosticOrder extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java index 8b8c904ecb1..213ab9bf89e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java @@ -37,196 +37,36 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.AttachmentDt; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1520,4 +1360,4 @@ public class DiagnosticReport extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java index edf9f6bf2ef..b4fb4903a32 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java @@ -37,196 +37,32 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1234,4 +1070,4 @@ public class DocumentManifest extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java index d2acc01106f..1280ccb7c3a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java @@ -37,196 +37,41 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.CompositeClientParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2634,4 +2479,4 @@ public class DocumentReference extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java index 25f55e2c79d..a9a1a219fea 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java @@ -37,196 +37,39 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; +import ca.uhn.fhir.model.dstu.composite.DurationDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2243,4 +2086,4 @@ public class Encounter extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java index 1ab8dfd8be2..6ae8e650076 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java @@ -37,196 +37,31 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.RangeDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; /** @@ -1047,4 +882,4 @@ public class FamilyHistory extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java index 4113f51f67a..d2e88ecb018 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java @@ -37,196 +37,30 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.AttachmentDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -1717,4 +1551,4 @@ public class GVFMeta extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java index fd85cb41038..5d90f43e474 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java @@ -37,196 +37,27 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.AttachmentDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -3365,4 +3196,4 @@ public class GVFVariant extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java index 0b4f0978965..b8f9a6055c1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java @@ -37,196 +37,25 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -1227,4 +1056,4 @@ public class GeneExpression extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java index 6c8ee8f7a80..621fa7135b9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java @@ -37,196 +37,28 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodingDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; /** @@ -1591,4 +1423,4 @@ public class GeneticAnalysis extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java index a461399e26f..1d8e599d85d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java @@ -37,196 +37,35 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.QuantityDt; +import ca.uhn.fhir.model.dstu.composite.RangeDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.CompositeClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1037,4 +876,4 @@ public class Group extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java index 4209ef01f34..260a5f26c21 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java @@ -37,196 +37,39 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2343,4 +2186,4 @@ public class ImagingStudy extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java index 454c28fef29..0abf3367386 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java @@ -37,196 +37,40 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.QuantityDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; +import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; +import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2366,4 +2210,4 @@ public class Immunization extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java index 9e833ce1471..69db89d2d24 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java @@ -37,196 +37,35 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1480,4 +1319,4 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java index 614cb5094d6..af520332ec5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java @@ -37,196 +37,33 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1147,4 +984,4 @@ public class ListResource extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java index 7c51d88b611..1641976d8b5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java @@ -37,196 +37,37 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1311,4 +1152,4 @@ public class Location extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java index d59ea1c629c..5d204d022e1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java @@ -37,196 +37,32 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.AttachmentDt; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1090,4 +926,4 @@ public class Media extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java index 7137e118ebe..d0c596caacf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java @@ -37,196 +37,30 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.RatioDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -984,4 +818,4 @@ public class Medication extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java index 06b71f4b0b1..d30786c2278 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java @@ -37,196 +37,36 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.QuantityDt; +import ca.uhn.fhir.model.dstu.composite.RatioDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; +import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1513,4 +1353,4 @@ public class MedicationAdministration extends BaseResource implements IResource -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java index 5545d89bbc3..b36cd036582 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java @@ -37,196 +37,39 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.QuantityDt; +import ca.uhn.fhir.model.dstu.composite.RatioDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.composite.ScheduleDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; +import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2128,4 +1971,4 @@ public class MedicationDispense extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java index 2756c93a7d8..73f9ab52588 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java @@ -37,196 +37,42 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.QuantityDt; +import ca.uhn.fhir.model.dstu.composite.RatioDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.composite.ScheduleDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; +import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1866,4 +1712,4 @@ public class MedicationPrescription extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java index ba305ef86f2..5e6641b2ac8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java @@ -37,196 +37,33 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.QuantityDt; +import ca.uhn.fhir.model.dstu.composite.RatioDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.composite.ScheduleDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1251,4 +1088,4 @@ public class MedicationStatement extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java index 99d20fb407e..f8c68214c12 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java @@ -37,194 +37,29 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; @@ -1436,4 +1271,4 @@ public class MessageHeader extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java index 8076d460529..1d99def65fc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java @@ -37,196 +37,30 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -1655,4 +1489,4 @@ public class Microarray extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java index dae85874f94..73a9e5b11ee 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java @@ -37,196 +37,49 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.QuantityDt; +import ca.uhn.fhir.model.dstu.composite.RangeDt; +import ca.uhn.fhir.model.dstu.composite.RatioDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.composite.SampledDataDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.CompositeClientParam; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.QuantityClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1900,4 +1753,4 @@ public class Observation extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java index fd7f36ad997..7ca704f5aeb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OperationOutcome.java @@ -37,196 +37,22 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.dstu.composite.CodingDt; +import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; /** @@ -584,4 +410,4 @@ public class OperationOutcome extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java index ad13c7cea0e..93413f13bf7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java @@ -37,196 +37,31 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.composite.ScheduleDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1015,4 +850,4 @@ public class Order extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java index 0260b69155e..0fa13d912d9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java @@ -37,196 +37,31 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -824,4 +659,4 @@ public class OrderResponse extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java index a5d6d6916e2..0cb7102589a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java @@ -37,196 +37,35 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1276,4 +1115,4 @@ public class Organization extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java index 9d397564e58..d52f6372067 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java @@ -37,196 +37,26 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -618,4 +448,4 @@ public class Other extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java index 73665bf0d9e..749fd1dcf40 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java @@ -37,196 +37,45 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; +import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; +import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2250,4 +2099,4 @@ public class Patient extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java index 9853655948c..1a809268ab3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java @@ -37,196 +37,39 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1527,4 +1370,4 @@ public class Practitioner extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java index 4a2e9eb5023..85868e468fc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java @@ -37,196 +37,31 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.PeriodDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1351,4 +1186,4 @@ public class Procedure extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java index aad13e94d3c..170b3de1b01 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java @@ -37,196 +37,48 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; import ca.uhn.fhir.model.dstu.composite.ContactDt; +import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; +import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; +import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -5283,4 +5135,4 @@ public class Profile extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java index 5b04f3f05a1..c467247aaea 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java @@ -37,196 +37,34 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; +import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1364,4 +1202,4 @@ public class Provenance extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java index 430d50f06bf..01e41b02419 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java @@ -37,196 +37,26 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1030,4 +860,4 @@ public class Query extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java index 97bfb4cf048..667f08dc289 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java @@ -37,182 +37,30 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; @@ -220,13 +68,12 @@ import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1656,4 +1503,4 @@ public class Questionnaire extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java index d520bc62916..b72577e5d60 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java @@ -37,196 +37,31 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; +import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -909,4 +744,4 @@ public class RelatedPerson extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java index f8790b7f2eb..c167fd52eab 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Remittance.java @@ -37,196 +37,24 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -708,4 +536,4 @@ public class Remittance extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java index 8de7b2a53b5..c295fc902e5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java @@ -37,150 +37,26 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; @@ -188,45 +64,17 @@ import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; import ca.uhn.fhir.model.primitive.Base64BinaryDt; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2561,4 +2409,4 @@ public class SecurityEvent extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java index 98903ad2ec9..df47230fdf8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java @@ -37,196 +37,29 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.AttachmentDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -826,4 +659,4 @@ public class SequencingAnalysis extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java index df74b07ed7d..d22719b8f29 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java @@ -37,196 +37,30 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.AttachmentDt; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.primitive.CodeDt; import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; /** @@ -1142,4 +976,4 @@ public class SequencingLab extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java index f1584415cbe..d8b738c24a3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java @@ -37,196 +37,29 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -869,4 +702,4 @@ public class Slot extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java index 105be31c316..dce33742a7f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java @@ -37,196 +37,38 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IDatatype; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; +import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; /** @@ -2029,4 +1871,4 @@ public class Specimen extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java index 1ad0f5b2f30..f816152f445 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java @@ -37,196 +37,36 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.composite.QuantityDt; +import ca.uhn.fhir.model.dstu.composite.RatioDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; +import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.NumberClientParam; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -957,4 +797,4 @@ public class Substance extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java index 80651341931..20ece25f013 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java @@ -37,196 +37,35 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IResource; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -1289,4 +1128,4 @@ public class Supply extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java index a9f8c95d611..1302b654641 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Test.java @@ -37,194 +37,22 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.primitive.Base64BinaryDt; import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; @@ -1602,4 +1430,4 @@ public class Test extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java index f70351f0866..95cb7940a4d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java @@ -37,196 +37,27 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; -import ca.uhn.fhir.model.primitive.BooleanDt; -import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; +import ca.uhn.fhir.model.api.Include; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.ContactDt; +import ca.uhn.fhir.model.dstu.composite.HumanNameDt; +import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; -import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.ReferenceClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -825,4 +656,4 @@ public class User extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java index 0658f2ad818..eb69bea10a0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ValueSet.java @@ -37,196 +37,36 @@ package ca.uhn.fhir.model.dstu.resource; */ -import java.util.*; -import ca.uhn.fhir.model.api.*; -import ca.uhn.fhir.model.api.annotation.*; -import ca.uhn.fhir.rest.gclient.*; +import java.util.Date; +import java.util.List; -import ca.uhn.fhir.model.dstu.composite.AddressDt; -import ca.uhn.fhir.model.dstu.valueset.AdministrativeGenderCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.AdmitSourceEnum; -import ca.uhn.fhir.model.dstu.resource.AdverseReaction; -import ca.uhn.fhir.model.dstu.valueset.AggregationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.AlertStatusEnum; -import ca.uhn.fhir.model.dstu.resource.AllergyIntolerance; -import ca.uhn.fhir.model.dstu.valueset.AnimalSpeciesEnum; -import ca.uhn.fhir.model.dstu.resource.Appointment; -import ca.uhn.fhir.model.dstu.composite.AttachmentDt; -import ca.uhn.fhir.model.dstu.resource.Availability; -import ca.uhn.fhir.model.dstu.valueset.BindingConformanceEnum; -import ca.uhn.fhir.model.dstu.resource.CarePlan; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanActivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanGoalStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CarePlanStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.CausalityExpectationEnum; -import ca.uhn.fhir.model.dstu.composite.CodeableConceptDt; -import ca.uhn.fhir.model.dstu.composite.CodingDt; -import ca.uhn.fhir.model.dstu.valueset.CompositionAttestationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.CompositionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConceptMapEquivalenceEnum; -import ca.uhn.fhir.model.dstu.resource.Condition; -import ca.uhn.fhir.model.dstu.valueset.ConditionRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConditionStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceEventModeEnum; -import ca.uhn.fhir.model.dstu.valueset.ConformanceStatementStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.ConstraintSeverityEnum; -import ca.uhn.fhir.model.dstu.composite.ContactDt; -import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; -import ca.uhn.fhir.model.dstu.valueset.CriticalityEnum; -import ca.uhn.fhir.model.dstu.valueset.DataTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Device; -import ca.uhn.fhir.model.dstu.resource.DeviceObservationReport; -import ca.uhn.fhir.model.dstu.resource.DiagnosticOrder; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderPriorityEnum; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticOrderStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; -import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentManifest; -import ca.uhn.fhir.model.dstu.valueset.DocumentModeEnum; -import ca.uhn.fhir.model.dstu.resource.DocumentReference; -import ca.uhn.fhir.model.dstu.valueset.DocumentReferenceStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.DocumentRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Encounter; -import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterReasonCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterStateEnum; -import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExposureTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ExtensionContextEnum; -import ca.uhn.fhir.model.dstu.valueset.FHIRDefinedTypeEnum; -import ca.uhn.fhir.model.dstu.resource.FamilyHistory; -import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; -import ca.uhn.fhir.model.dstu.resource.GVFMeta; -import ca.uhn.fhir.model.dstu.resource.Group; -import ca.uhn.fhir.model.dstu.valueset.GroupTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.HierarchicalRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.HumanNameDt; -import ca.uhn.fhir.model.dstu.composite.IdentifierDt; -import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; -import ca.uhn.fhir.model.dstu.valueset.ImagingModalityEnum; -import ca.uhn.fhir.model.dstu.resource.ImagingStudy; -import ca.uhn.fhir.model.dstu.resource.Immunization; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationReasonCodesEnum; -import ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationDateCriterionCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRecommendationStatusCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ImmunizationRouteCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.InstanceAvailabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.LinkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ListModeEnum; -import ca.uhn.fhir.model.dstu.resource.Location; -import ca.uhn.fhir.model.dstu.valueset.LocationModeEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.LocationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.MaritalStatusCodesEnum; -import ca.uhn.fhir.model.dstu.resource.Media; -import ca.uhn.fhir.model.dstu.valueset.MediaTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Medication; -import ca.uhn.fhir.model.dstu.resource.MedicationAdministration; -import ca.uhn.fhir.model.dstu.valueset.MedicationAdministrationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationDispense; -import ca.uhn.fhir.model.dstu.valueset.MedicationDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.MedicationKindEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationPrescription; -import ca.uhn.fhir.model.dstu.valueset.MedicationPrescriptionStatusEnum; -import ca.uhn.fhir.model.dstu.resource.MedicationStatement; -import ca.uhn.fhir.model.dstu.valueset.MessageEventEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageSignificanceCategoryEnum; -import ca.uhn.fhir.model.dstu.valueset.MessageTransportEnum; -import ca.uhn.fhir.model.dstu.resource.Microarray; -import ca.uhn.fhir.model.dstu.valueset.ModalityEnum; -import ca.uhn.fhir.model.dstu.resource.Observation; -import ca.uhn.fhir.model.dstu.valueset.ObservationInterpretationCodesEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationReliabilityEnum; -import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; -import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.model.dstu.resource.Order; -import ca.uhn.fhir.model.dstu.valueset.OrderOutcomeStatusEnum; -import ca.uhn.fhir.model.dstu.resource.Organization; -import ca.uhn.fhir.model.dstu.valueset.OrganizationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ParticipantTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Patient; -import ca.uhn.fhir.model.dstu.valueset.PatientRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.composite.PeriodDt; -import ca.uhn.fhir.model.dstu.resource.Practitioner; -import ca.uhn.fhir.model.dstu.valueset.PractitionerRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.PractitionerSpecialtyEnum; -import ca.uhn.fhir.model.dstu.resource.Procedure; -import ca.uhn.fhir.model.dstu.valueset.ProcedureRelationshipTypeEnum; -import ca.uhn.fhir.model.dstu.resource.Profile; -import ca.uhn.fhir.model.dstu.valueset.PropertyRepresentationEnum; -import ca.uhn.fhir.model.dstu.valueset.ProvenanceEntityRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; -import ca.uhn.fhir.model.dstu.composite.QuantityDt; -import ca.uhn.fhir.model.dstu.valueset.QueryOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireGroupNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireNameEnum; -import ca.uhn.fhir.model.dstu.valueset.QuestionnaireStatusEnum; -import ca.uhn.fhir.model.dstu.composite.RangeDt; -import ca.uhn.fhir.model.dstu.composite.RatioDt; -import ca.uhn.fhir.model.dstu.valueset.ReactionSeverityEnum; -import ca.uhn.fhir.model.dstu.resource.RelatedPerson; -import ca.uhn.fhir.model.dstu.valueset.ResourceProfileStatusEnum; -import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; -import ca.uhn.fhir.model.dstu.valueset.ResourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.ResponseTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulConformanceModeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.RestfulSecurityServiceEnum; -import ca.uhn.fhir.model.dstu.composite.SampledDataDt; -import ca.uhn.fhir.model.dstu.composite.ScheduleDt; -import ca.uhn.fhir.model.dstu.valueset.SearchParamTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventActionEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectLifecycleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectRoleEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectSensitivityEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventObjectTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventOutcomeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventParticipantNetworkTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SecurityEventSourceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SensitivityTypeEnum; -import ca.uhn.fhir.model.dstu.resource.SequencingAnalysis; -import ca.uhn.fhir.model.dstu.resource.SequencingLab; -import ca.uhn.fhir.model.dstu.valueset.SlicingRulesEnum; -import ca.uhn.fhir.model.dstu.resource.Slot; -import ca.uhn.fhir.model.dstu.resource.Specimen; -import ca.uhn.fhir.model.dstu.valueset.SpecimenCollectionMethodEnum; -import ca.uhn.fhir.model.dstu.valueset.SpecimenTreatmentProcedureEnum; -import ca.uhn.fhir.model.dstu.resource.Substance; -import ca.uhn.fhir.model.dstu.valueset.SubstanceTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyDispenseStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyItemTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyStatusEnum; -import ca.uhn.fhir.model.dstu.valueset.SupplyTypeEnum; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.model.dstu.resource.ValueSet; -import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; -import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.BaseIdentifiableElement; +import ca.uhn.fhir.model.api.BaseResource; +import ca.uhn.fhir.model.api.IElement; import ca.uhn.fhir.model.api.IResource; -import ca.uhn.fhir.model.dstu.composite.AgeDt; -import ca.uhn.fhir.model.dstu.composite.DurationDt; -import ca.uhn.fhir.model.dstu.resource.Binary; -import ca.uhn.fhir.model.primitive.Base64BinaryDt; +import ca.uhn.fhir.model.api.IResourceBlock; +import ca.uhn.fhir.model.api.TemporalPrecisionEnum; +import ca.uhn.fhir.model.api.annotation.Block; +import ca.uhn.fhir.model.api.annotation.Child; +import ca.uhn.fhir.model.api.annotation.Description; +import ca.uhn.fhir.model.api.annotation.ResourceDef; +import ca.uhn.fhir.model.api.annotation.SearchParamDefinition; +import ca.uhn.fhir.model.dstu.composite.ContactDt; +import ca.uhn.fhir.model.dstu.composite.IdentifierDt; +import ca.uhn.fhir.model.dstu.valueset.ContactUseEnum; +import ca.uhn.fhir.model.dstu.valueset.FilterOperatorEnum; +import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum; +import ca.uhn.fhir.model.dstu.valueset.ValueSetStatusEnum; import ca.uhn.fhir.model.primitive.BooleanDt; import ca.uhn.fhir.model.primitive.BoundCodeDt; -import ca.uhn.fhir.model.primitive.BoundCodeableConceptDt; import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.DateDt; import ca.uhn.fhir.model.primitive.DateTimeDt; -import ca.uhn.fhir.model.primitive.DecimalDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.IdrefDt; import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.IntegerDt; -import ca.uhn.fhir.model.primitive.OidDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.UriDt; +import ca.uhn.fhir.rest.gclient.DateClientParam; +import ca.uhn.fhir.rest.gclient.StringClientParam; +import ca.uhn.fhir.rest.gclient.TokenClientParam; /** @@ -2930,4 +2770,4 @@ public class ValueSet extends BaseResource implements IResource { -} \ No newline at end of file +} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AddressUseEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AddressUseEnum.java index c845c73b9b0..6b0a2e1a276 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AddressUseEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AddressUseEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum AddressUseEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdministrativeGenderCodesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdministrativeGenderCodesEnum.java index 03958237e0d..159b51a85d9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdministrativeGenderCodesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdministrativeGenderCodesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum AdministrativeGenderCodesEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdmitSourceEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdmitSourceEnum.java index c446e09f86f..81541d5cf28 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdmitSourceEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AdmitSourceEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum AdmitSourceEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AggregationModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AggregationModeEnum.java index bff0f0bae26..c357091a59c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AggregationModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AggregationModeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum AggregationModeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AlertStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AlertStatusEnum.java index cbcda9f5396..29ba7df6d49 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AlertStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AlertStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum AlertStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AnimalSpeciesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AnimalSpeciesEnum.java index ff25212a03b..21b49d66d62 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AnimalSpeciesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/AnimalSpeciesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum AnimalSpeciesEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/BindingConformanceEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/BindingConformanceEnum.java index c5136060dc5..6529e6b7424 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/BindingConformanceEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/BindingConformanceEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum BindingConformanceEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityCategoryEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityCategoryEnum.java index cf79b312dd7..dd6682ba5e6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityCategoryEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityCategoryEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum CarePlanActivityCategoryEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityStatusEnum.java index 5bec553e5df..278d134c7b8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanActivityStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum CarePlanActivityStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanGoalStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanGoalStatusEnum.java index f5c1cfe44cd..0994e7aabec 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanGoalStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanGoalStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum CarePlanGoalStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanStatusEnum.java index ca2971af5e3..25211e8b113 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CarePlanStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum CarePlanStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CausalityExpectationEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CausalityExpectationEnum.java index 4076e72fea4..2799d3a94ad 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CausalityExpectationEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CausalityExpectationEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum CausalityExpectationEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CompositionAttestationModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CompositionAttestationModeEnum.java index 210d43be730..f40d6d0e336 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CompositionAttestationModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CompositionAttestationModeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum CompositionAttestationModeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CompositionStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CompositionStatusEnum.java index c142cafee3f..39f71949efe 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CompositionStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CompositionStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum CompositionStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConceptMapEquivalenceEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConceptMapEquivalenceEnum.java index 962737e8211..5a3ff84e710 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConceptMapEquivalenceEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConceptMapEquivalenceEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ConceptMapEquivalenceEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConditionRelationshipTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConditionRelationshipTypeEnum.java index c6b9ec47808..2eb3485a4cb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConditionRelationshipTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConditionRelationshipTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ConditionRelationshipTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConditionStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConditionStatusEnum.java index ff65963ed23..0901dbfaede 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConditionStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConditionStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ConditionStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceEventModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceEventModeEnum.java index cc4df1babd0..2ec8672e005 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceEventModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceEventModeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ConformanceEventModeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceStatementStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceStatementStatusEnum.java index 0c920ff77ac..25a815adc5e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceStatementStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConformanceStatementStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ConformanceStatementStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConstraintSeverityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConstraintSeverityEnum.java index 797c8f99f12..bd7d0ba0e98 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConstraintSeverityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ConstraintSeverityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ConstraintSeverityEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactSystemEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactSystemEnum.java index ac5c2afd369..2128ac0e2f8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactSystemEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactSystemEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ContactSystemEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactUseEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactUseEnum.java index d6cc87ac2fe..513a514c249 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactUseEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ContactUseEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ContactUseEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CriticalityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CriticalityEnum.java index c924725ed8a..bed8a58031e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CriticalityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/CriticalityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum CriticalityEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DataTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DataTypeEnum.java index 63fab875424..0e4dc7704d6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DataTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DataTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum DataTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderPriorityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderPriorityEnum.java index cbc7a8814ce..f45c0215d15 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderPriorityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderPriorityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum DiagnosticOrderPriorityEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderStatusEnum.java index 1b5d8f011b2..cf8ae74e88f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticOrderStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum DiagnosticOrderStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticReportStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticReportStatusEnum.java index 4bac5bff48f..cf64f0b5225 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticReportStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DiagnosticReportStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum DiagnosticReportStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentModeEnum.java index 1e6d9f8190e..a0e2cfb35c5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentModeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum DocumentModeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentReferenceStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentReferenceStatusEnum.java index 4ef79ec0fcf..1c8c61108ea 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentReferenceStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentReferenceStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum DocumentReferenceStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentRelationshipTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentRelationshipTypeEnum.java index 6e8375292bd..e40fdf75050 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentRelationshipTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/DocumentRelationshipTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum DocumentRelationshipTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterClassEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterClassEnum.java index 21bb1b12386..0d020a1d979 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterClassEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterClassEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum EncounterClassEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterReasonCodesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterReasonCodesEnum.java index 19048d26de7..4d3b793b246 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterReasonCodesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterReasonCodesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum EncounterReasonCodesEnum { ; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterStateEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterStateEnum.java index ffaeaaea2de..14212280779 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterStateEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterStateEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum EncounterStateEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterTypeEnum.java index 501a5969ec2..124d1739c8c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EncounterTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum EncounterTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EventTimingEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EventTimingEnum.java index d9c941f7489..880fc6ae335 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EventTimingEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/EventTimingEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum EventTimingEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ExposureTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ExposureTypeEnum.java index 1724c99d280..188418e2868 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ExposureTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ExposureTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ExposureTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ExtensionContextEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ExtensionContextEnum.java index 949649ae106..3002ee1051a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ExtensionContextEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ExtensionContextEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ExtensionContextEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FHIRDefinedTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FHIRDefinedTypeEnum.java index 35d8a68a5ed..8ba21599461 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FHIRDefinedTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FHIRDefinedTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum FHIRDefinedTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FilterOperatorEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FilterOperatorEnum.java index 5872df79b9b..4ed5a1f51f9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FilterOperatorEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/FilterOperatorEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum FilterOperatorEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/GroupTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/GroupTypeEnum.java index 58082415066..1c05812dfc6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/GroupTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/GroupTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum GroupTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/HierarchicalRelationshipTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/HierarchicalRelationshipTypeEnum.java index c7ae9049974..97c8802702d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/HierarchicalRelationshipTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/HierarchicalRelationshipTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum HierarchicalRelationshipTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IdentifierUseEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IdentifierUseEnum.java index 0d3a378d452..5a45f1a3357 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IdentifierUseEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IdentifierUseEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum IdentifierUseEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImagingModalityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImagingModalityEnum.java index 2749f732795..1042cb63cc1 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImagingModalityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImagingModalityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ImagingModalityEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationReasonCodesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationReasonCodesEnum.java index afcb698a16c..c1a5691fcbc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationReasonCodesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationReasonCodesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ImmunizationReasonCodesEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRecommendationDateCriterionCodesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRecommendationDateCriterionCodesEnum.java index 0a85a6edf34..372bab96f95 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRecommendationDateCriterionCodesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRecommendationDateCriterionCodesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ImmunizationRecommendationDateCriterionCodesEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRecommendationStatusCodesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRecommendationStatusCodesEnum.java index 09f9708e523..10715f6f3ee 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRecommendationStatusCodesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRecommendationStatusCodesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ImmunizationRecommendationStatusCodesEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRouteCodesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRouteCodesEnum.java index e2d7ded6f77..612787ed040 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRouteCodesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ImmunizationRouteCodesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ImmunizationRouteCodesEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/InstanceAvailabilityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/InstanceAvailabilityEnum.java index 1835d9ecdf6..2d0bd9350ef 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/InstanceAvailabilityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/InstanceAvailabilityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum InstanceAvailabilityEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IssueSeverityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IssueSeverityEnum.java index bbe862dcd96..987894d99f2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IssueSeverityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IssueSeverityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum IssueSeverityEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IssueTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IssueTypeEnum.java index 429350761dd..9a5a46189d3 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IssueTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/IssueTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum IssueTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LinkTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LinkTypeEnum.java index c55de59dd86..403faa4c46c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LinkTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LinkTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum LinkTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ListModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ListModeEnum.java index c2be91b3c36..625b4a2040e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ListModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ListModeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ListModeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationModeEnum.java index e965f945bb3..e7893e41bd6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationModeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum LocationModeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationStatusEnum.java index 2477828a8cd..c14bf98dde4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum LocationStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationTypeEnum.java index b7f5df846e7..eaaccad4a13 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/LocationTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum LocationTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MaritalStatusCodesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MaritalStatusCodesEnum.java index 2ffba4eb2c1..ce27e00c8c6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MaritalStatusCodesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MaritalStatusCodesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum MaritalStatusCodesEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MediaTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MediaTypeEnum.java index 98a7e0fdee6..f8fc7784671 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MediaTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MediaTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum MediaTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationAdministrationStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationAdministrationStatusEnum.java index ce5aae7c5d8..c86e2f61718 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationAdministrationStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationAdministrationStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum MedicationAdministrationStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationDispenseStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationDispenseStatusEnum.java index c004cf1b0bd..514b0a1d5da 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationDispenseStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationDispenseStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum MedicationDispenseStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationKindEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationKindEnum.java index 2d46ba4459e..b9690d479fd 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationKindEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationKindEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum MedicationKindEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationPrescriptionStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationPrescriptionStatusEnum.java index 3ec1ae6c2ce..7919cb05cab 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationPrescriptionStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MedicationPrescriptionStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum MedicationPrescriptionStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageEventEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageEventEnum.java index 1685e7eedac..2d58cce8cbb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageEventEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageEventEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum MessageEventEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageSignificanceCategoryEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageSignificanceCategoryEnum.java index 1a2de2771f8..fbeb3a1872c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageSignificanceCategoryEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageSignificanceCategoryEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum MessageSignificanceCategoryEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageTransportEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageTransportEnum.java index 1a44803c755..8520487bb23 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageTransportEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/MessageTransportEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum MessageTransportEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ModalityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ModalityEnum.java index 7396e7faf3c..8e83d5e2425 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ModalityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ModalityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ModalityEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/NameUseEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/NameUseEnum.java index b0f8679944f..db585060635 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/NameUseEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/NameUseEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum NameUseEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationInterpretationCodesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationInterpretationCodesEnum.java index 21f3dbe2fe3..04bba450bde 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationInterpretationCodesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationInterpretationCodesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ObservationInterpretationCodesEnum { ; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationRelationshipTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationRelationshipTypeEnum.java index 6544df2faaf..432f099573e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationRelationshipTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationRelationshipTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ObservationRelationshipTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationReliabilityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationReliabilityEnum.java index 7f9d1cc909e..ab9b2e8d260 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationReliabilityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationReliabilityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ObservationReliabilityEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationStatusEnum.java index 7f0e75109cd..d7517c2c425 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ObservationStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ObservationStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/OrderOutcomeStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/OrderOutcomeStatusEnum.java index ffe1df461ae..13c71b0c993 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/OrderOutcomeStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/OrderOutcomeStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum OrderOutcomeStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/OrganizationTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/OrganizationTypeEnum.java index 2dbaa3636af..210b4b93b80 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/OrganizationTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/OrganizationTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum OrganizationTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ParticipantTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ParticipantTypeEnum.java index 1b595ef2187..a13a453a126 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ParticipantTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ParticipantTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ParticipantTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PatientRelationshipTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PatientRelationshipTypeEnum.java index 4983c132b7b..9e6b42dd254 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PatientRelationshipTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PatientRelationshipTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum PatientRelationshipTypeEnum { ; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PractitionerRoleEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PractitionerRoleEnum.java index ed61e4df5bb..1c515744115 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PractitionerRoleEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PractitionerRoleEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum PractitionerRoleEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PractitionerSpecialtyEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PractitionerSpecialtyEnum.java index cf0b56b124b..3e5593480c2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PractitionerSpecialtyEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PractitionerSpecialtyEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum PractitionerSpecialtyEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ProcedureRelationshipTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ProcedureRelationshipTypeEnum.java index 9a3579bc907..94192e1d3f5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ProcedureRelationshipTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ProcedureRelationshipTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ProcedureRelationshipTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PropertyRepresentationEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PropertyRepresentationEnum.java index bd9c8f817d6..a699005c172 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PropertyRepresentationEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/PropertyRepresentationEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum PropertyRepresentationEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ProvenanceEntityRoleEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ProvenanceEntityRoleEnum.java index d3dbcea71c9..0e85480d9c8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ProvenanceEntityRoleEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ProvenanceEntityRoleEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ProvenanceEntityRoleEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuantityCompararatorEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuantityCompararatorEnum.java index 7c2d018ddb1..c3824610172 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuantityCompararatorEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuantityCompararatorEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum QuantityCompararatorEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QueryOutcomeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QueryOutcomeEnum.java index 60b4758ef03..b0e31e055a2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QueryOutcomeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QueryOutcomeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum QueryOutcomeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireGroupNameEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireGroupNameEnum.java index bb136adb065..81d7669124d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireGroupNameEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireGroupNameEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum QuestionnaireGroupNameEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireNameEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireNameEnum.java index f24bc5cfab9..b9ea1a33eae 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireNameEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireNameEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum QuestionnaireNameEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireStatusEnum.java index 6c9daa0da64..d4ae7940d0a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuestionnaireStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum QuestionnaireStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ReactionSeverityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ReactionSeverityEnum.java index 5ebf58abb9a..b13f24ccf4a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ReactionSeverityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ReactionSeverityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ReactionSeverityEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceProfileStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceProfileStatusEnum.java index 5d0309e008c..f9f6ccf7a3e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceProfileStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceProfileStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ResourceProfileStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceTypeEnum.java index 4aa35fce1c6..584193d7d9f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResourceTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ResourceTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResponseTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResponseTypeEnum.java index 6ee4f8d4707..b8cd98fb5c5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResponseTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ResponseTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ResponseTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulConformanceModeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulConformanceModeEnum.java index 8e3e4fdfae4..f7d475f97f9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulConformanceModeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulConformanceModeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum RestfulConformanceModeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulOperationSystemEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulOperationSystemEnum.java index 2dde542203f..dad65973d1e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulOperationSystemEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulOperationSystemEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum RestfulOperationSystemEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulOperationTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulOperationTypeEnum.java index a508cf4623d..e80f0136ff5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulOperationTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulOperationTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum RestfulOperationTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulSecurityServiceEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulSecurityServiceEnum.java index b25d89a911f..e831431b7c5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulSecurityServiceEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/RestfulSecurityServiceEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum RestfulSecurityServiceEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SearchParamTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SearchParamTypeEnum.java index 00f2ed170c7..fa832257de5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SearchParamTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SearchParamTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SearchParamTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventActionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventActionEnum.java index 083d52de9b0..78d8fd7bd5c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventActionEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventActionEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SecurityEventActionEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectLifecycleEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectLifecycleEnum.java index 02e9a5f6f8e..1fec43bcc69 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectLifecycleEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectLifecycleEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SecurityEventObjectLifecycleEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectRoleEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectRoleEnum.java index 20377da7b38..d988f0c5e4e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectRoleEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectRoleEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SecurityEventObjectRoleEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectSensitivityEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectSensitivityEnum.java index 4e2e3157ca3..e5f9cd4dded 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectSensitivityEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectSensitivityEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SecurityEventObjectSensitivityEnum { ; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectTypeEnum.java index 12dda9bc321..c2336759418 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SecurityEventObjectTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventOutcomeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventOutcomeEnum.java index b1e312a4c90..02d5dae43ea 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventOutcomeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventOutcomeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SecurityEventOutcomeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventParticipantNetworkTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventParticipantNetworkTypeEnum.java index e9b1a80aecc..3350b201e9b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventParticipantNetworkTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventParticipantNetworkTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SecurityEventParticipantNetworkTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventSourceTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventSourceTypeEnum.java index 85871c7ee9a..c96078f53be 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventSourceTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventSourceTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SecurityEventSourceTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SensitivityStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SensitivityStatusEnum.java index bc2a5807000..e445b2d0629 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SensitivityStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SensitivityStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SensitivityStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SensitivityTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SensitivityTypeEnum.java index 2960482ae31..abeb885c6a5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SensitivityTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SensitivityTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SensitivityTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SlicingRulesEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SlicingRulesEnum.java index faa3cc40e70..6c9a4196b14 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SlicingRulesEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SlicingRulesEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SlicingRulesEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SpecimenCollectionMethodEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SpecimenCollectionMethodEnum.java index 64db0128800..6b8890b1b10 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SpecimenCollectionMethodEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SpecimenCollectionMethodEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SpecimenCollectionMethodEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SpecimenTreatmentProcedureEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SpecimenTreatmentProcedureEnum.java index b2ee373d21a..330b7951be4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SpecimenTreatmentProcedureEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SpecimenTreatmentProcedureEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SpecimenTreatmentProcedureEnum { ; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SubstanceTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SubstanceTypeEnum.java index 52c4597a694..81d81cc554e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SubstanceTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SubstanceTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SubstanceTypeEnum { ; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyDispenseStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyDispenseStatusEnum.java index 95577c397bd..172e4eca2c6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyDispenseStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyDispenseStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SupplyDispenseStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyItemTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyItemTypeEnum.java index 2f95b75fff6..92187c0a9ef 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyItemTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyItemTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SupplyItemTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyStatusEnum.java index 36ce306fae9..1f8f17d5723 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SupplyStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyTypeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyTypeEnum.java index 3c531d6b541..21de037429c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyTypeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SupplyTypeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum SupplyTypeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/UnitsOfTimeEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/UnitsOfTimeEnum.java index 33a88ab0ff1..90d2afeedf8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/UnitsOfTimeEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/UnitsOfTimeEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum UnitsOfTimeEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ValueSetStatusEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ValueSetStatusEnum.java index c9b7ef51eef..3f3fab02a86 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ValueSetStatusEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/ValueSetStatusEnum.java @@ -21,10 +21,11 @@ package ca.uhn.fhir.model.dstu.valueset; * #L% */ -import ca.uhn.fhir.model.api.*; import java.util.HashMap; import java.util.Map; +import ca.uhn.fhir.model.api.IValueSetEnumBinder; + public enum ValueSetStatusEnum { /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java index d1871f5df25..c7721b316ce 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BaseDateTimeDt.java @@ -20,11 +20,7 @@ package ca.uhn.fhir.model.primitive; * #L% */ -import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.DAY; -import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.MILLI; -import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.MONTH; -import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.SECOND; -import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.YEAR; +import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.*; import java.text.ParseException; import java.util.Calendar; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeableConceptDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeableConceptDt.java index 802c838023d..621ab06dcf4 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeableConceptDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeableConceptDt.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.model.primitive; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.*; import java.util.Collection; import java.util.HashSet; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/CodeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/CodeDt.java index 8a12ae0bf33..eff27b3ab2a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/CodeDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/CodeDt.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.model.primitive; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.*; import ca.uhn.fhir.model.api.BasePrimitive; import ca.uhn.fhir.model.api.annotation.DatatypeDef; import ca.uhn.fhir.model.api.annotation.SimpleSetter; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java index 7379a987dec..2bfa7c60460 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/IdDt.java @@ -20,8 +20,7 @@ package ca.uhn.fhir.model.primitive; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.math.BigDecimal; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java index 95bf7531148..9d45be75d47 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.narrative; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.File; import java.io.FileInputStream; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java index 79490dcef92..fb6ab6aaf1d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java @@ -20,9 +20,7 @@ package ca.uhn.fhir.parser; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultString; -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.Reader; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java index 32c8cd8a624..dc8498b7fdc 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/ParserState.java @@ -20,8 +20,7 @@ package ca.uhn.fhir.parser; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultIfBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java index 4a228b327c8..aceda2a2b67 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java @@ -20,9 +20,7 @@ package ca.uhn.fhir.parser; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultString; -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.Reader; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Search.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Search.java index ea3986cb53c..94d46003ef5 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Search.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Search.java @@ -50,7 +50,17 @@ public @interface Search { *

*/ String queryName() default ""; - + + /** + * If specified, this the name for the compartment + * + *

+ * See the FHIR specification section on + * compartments + *

+ */ + String compartmentName() default ""; + /** * The return type for this method. This generally does not need * to be populated for {@link IResourceProvider resource providers} in a server implementation, diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java index 1d8934b7582..b8d0cebd0e2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/GenericClient.java @@ -20,8 +20,7 @@ package ca.uhn.fhir.rest.client; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.Reader; @@ -241,7 +240,7 @@ public class GenericClient extends BaseClient implements IGenericClient { params.put(nextEntry.getKey() + qualifier, valueList); } - HttpGetClientInvocation invocation = SearchMethodBinding.createSearchInvocation(toResourceName(theType), params); + BaseHttpClientInvocation invocation = SearchMethodBinding.createSearchInvocation(myContext, toResourceName(theType), params, null, null, null); if (isKeepResponses()) { myLastRequest = invocation.asHttpRequest(getServerBase(), createExtraParams(), getEncoding()); } @@ -422,8 +421,7 @@ public class GenericClient extends BaseClient implements IGenericClient { } @Override - public Bundle invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, - BaseServerResponseException { + public Bundle invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException { EncodingEnum respType = EncodingEnum.forContentType(theResponseMimeType); if (respType == null) { throw NonFhirResponseException.newInstance(theResponseStatusCode, theResponseMimeType, theResponseReader); @@ -714,8 +712,7 @@ public class GenericClient extends BaseClient implements IGenericClient { private final class OperationOutcomeResponseHandler implements IClientResponseHandler { @Override - public OperationOutcome invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, - BaseServerResponseException { + public OperationOutcome invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException { EncodingEnum respType = EncodingEnum.forContentType(theResponseMimeType); if (respType == null) { return null; @@ -742,8 +739,7 @@ public class GenericClient extends BaseClient implements IGenericClient { } @Override - public MethodOutcome invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, - BaseServerResponseException { + public MethodOutcome invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException { MethodOutcome response = MethodUtil.process2xxResponse(myContext, myResourceName, theResponseStatusCode, theResponseMimeType, theResponseReader, theHeaders); if (theResponseStatusCode == Constants.STATUS_HTTP_201_CREATED) { response.setCreated(true); @@ -761,8 +757,7 @@ public class GenericClient extends BaseClient implements IGenericClient { } @Override - public List invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, - BaseServerResponseException { + public List invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException { return new BundleResponseHandler(myType).invokeClient(theResponseMimeType, theResponseReader, theResponseStatusCode, theHeaders).toListOfResources(); } } @@ -799,15 +794,14 @@ public class GenericClient extends BaseClient implements IGenericClient { private class SearchInternal extends BaseClientExecutable implements IQuery, IUntypedQuery { private List myCriterion = new ArrayList(); - private List myInclude = new ArrayList(); - private Integer myParamLimit; private String myResourceName; private Class myResourceType; private List mySort = new ArrayList(); - private SearchStyleEnum mySearchStyle; + private String myResourceId; + private String myCompartmentName; public SearchInternal() { myResourceType = null; @@ -824,10 +818,10 @@ public class GenericClient extends BaseClient implements IGenericClient { public Bundle execute() { Map> params = new LinkedHashMap>(); -// Map> initial = createExtraParams(); -// if (initial != null) { -// params.putAll(initial); -// } + // Map> initial = createExtraParams(); + // if (initial != null) { + // params.putAll(initial); + // } for (ICriterionInternal next : myCriterion) { String parameterName = next.getParameterName(); @@ -849,36 +843,10 @@ public class GenericClient extends BaseClient implements IGenericClient { BundleResponseHandler binding = new BundleResponseHandler(myResourceType); - SearchStyleEnum searchStyle = mySearchStyle; - if (searchStyle == null) { - int length = 0; - for (Entry> nextEntry : params.entrySet()) { - length += nextEntry.getKey().length(); - for (String next : nextEntry.getValue()) { - length += next.length(); - } - } - - if (length < 5000) { - searchStyle = SearchStyleEnum.GET; - } else { - searchStyle = SearchStyleEnum.POST; - } - } - - BaseHttpClientInvocation invocation; - switch (searchStyle) { - case GET: - default: - invocation = new HttpGetClientInvocation(params, myResourceName); - break; - case GET_WITH_SEARCH: - invocation = new HttpGetClientInvocation(params, myResourceName, Constants.PARAM_SEARCH); - break; - case POST: - invocation = new HttpPostClientInvocation(myContext, params, myResourceName, Constants.PARAM_SEARCH); - } - + IdDt resourceId = myResourceId != null? new IdDt(myResourceId ) : null; + + BaseHttpClientInvocation invocation = SearchMethodBinding.createSearchInvocation(myContext, myResourceName, params, resourceId, myCompartmentName, mySearchStyle); + return invoke(params, binding, invocation); } @@ -946,6 +914,13 @@ public class GenericClient extends BaseClient implements IGenericClient { return this; } + @Override + public IQuery withIdAndCompartment(String theResourceId, String theCompartmentName) { + myResourceId = theResourceId; + myCompartmentName = theCompartmentName; + return this; + } + } private static class SortInternal implements ISort { @@ -992,8 +967,7 @@ public class GenericClient extends BaseClient implements IGenericClient { private final class TagListResponseHandler implements IClientResponseHandler { @Override - public TagList invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, - BaseServerResponseException { + public TagList invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException { EncodingEnum respType = EncodingEnum.forContentType(theResponseMimeType); if (respType == null) { throw NonFhirResponseException.newInstance(theResponseStatusCode, theResponseMimeType, theResponseReader); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java index 06d1e51907b..078f6265395 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.client.exceptions; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.Reader; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeCriterion.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeCriterion.java index cd5fe6e8f3a..6c6161f9897 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeCriterion.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/CompositeCriterion.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.gclient; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.*; public class CompositeCriterion implements ICompositeWithLeft, ICriterion, ICriterionInternal { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java index 309cfb936a2..552b11b1fc8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java @@ -44,5 +44,7 @@ public interface IQuery extends IClientExecutable { * @since 0.6 */ IQuery usingStyle(SearchStyleEnum theStyle); + + IQuery withIdAndCompartment(String theResourceId, String theCompartmentName); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java index 74ec40a12ea..d3a65b70359 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/QuantityClientParam.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.gclient; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.*; import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum; import ca.uhn.fhir.rest.gclient.NumberClientParam.IMatches; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java index 0388c398ac3..3bc04441f80 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/TokenClientParam.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.rest.gclient; -import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.*; import java.util.Arrays; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseHttpClientInvocationWithContents.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseHttpClientInvocationWithContents.java index 252361aca22..9682eb5097f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseHttpClientInvocationWithContents.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseHttpClientInvocationWithContents.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.UnsupportedEncodingException; import java.util.ArrayList; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java index 1b682e2e52d..935db8f71da 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseMethodBinding.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.Reader; @@ -355,7 +355,7 @@ public abstract class BaseMethodBinding implements IClientResponseHandler return new ReadMethodBinding(returnType, theMethod, theContext, theProvider); } else if (search != null) { String queryName = search.queryName(); - return new SearchMethodBinding(returnType, theMethod, queryName, theContext, theProvider); + return new SearchMethodBinding(returnType, theMethod, theContext, theProvider); } else if (conformance != null) { return new ConformanceMethodBinding(theMethod, theContext, theProvider); } else if (create != null) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/HistoryMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/HistoryMethodBinding.java index 5aeb6c9a2d9..98df4fd266d 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/HistoryMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/HistoryMethodBinding.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.lang.reflect.Method; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/MethodUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/MethodUtil.java index 17f1ed1bd18..cae87e671a2 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/MethodUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/MethodUtil.java @@ -1,7 +1,6 @@ package ca.uhn.fhir.rest.method; -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.PushbackReader; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/Request.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/Request.java index 42b013e1390..328905129fb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/Request.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/Request.java @@ -41,7 +41,6 @@ public class Request extends RequestDetails { private String myFhirServerBase; private String myOperation; private RequestType myRequestType; - private boolean myRespondGzip; private String mySecondaryOperation; private HttpServletRequest myServletRequest; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java index 25506299d72..5a6e829dc63 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java @@ -28,6 +28,7 @@ import ca.uhn.fhir.model.primitive.IdDt; public class RequestDetails { + private String myCompartmentName; private IdDt myId; private OtherOperationTypeEnum myOtherOperationType; private Map myParameters; @@ -35,6 +36,10 @@ public class RequestDetails { private RestfulOperationTypeEnum myResourceOperationType; private RestfulOperationSystemEnum mySystemOperationType; + public String getCompartmentName() { + return myCompartmentName; + } + public IdDt getId() { return myId; } @@ -59,6 +64,10 @@ public class RequestDetails { return mySystemOperationType; } + public void setCompartmentName(String theCompartmentName) { + myCompartmentName = theCompartmentName; + } + public void setId(IdDt theId) { myId = theId; } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SearchMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SearchMethodBinding.java index 40dfe7b1762..a313d3ce53b 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SearchMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SearchMethodBinding.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.lang.reflect.Method; import java.util.Collections; @@ -29,6 +29,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.Map.Entry; import org.apache.commons.lang3.StringUtils; @@ -38,6 +39,9 @@ import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.dstu.valueset.RestfulOperationSystemEnum; import ca.uhn.fhir.model.dstu.valueset.RestfulOperationTypeEnum; +import ca.uhn.fhir.model.primitive.IdDt; +import ca.uhn.fhir.rest.annotation.Search; +import ca.uhn.fhir.rest.client.BaseHttpClientInvocation; import ca.uhn.fhir.rest.param.BaseQueryParameter; import ca.uhn.fhir.rest.server.Constants; import ca.uhn.fhir.rest.server.IBundleProvider; @@ -53,12 +57,18 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { private Class myDeclaredResourceType; private String myQueryName; private String myDescription; + private String myCompartmentName; + + private Integer myIdParamIndex; @SuppressWarnings("unchecked") - public SearchMethodBinding(Class theReturnResourceType, Method theMethod, String theQueryName, FhirContext theContext, Object theProvider) { + public SearchMethodBinding(Class theReturnResourceType, Method theMethod, FhirContext theContext, Object theProvider) { super(theReturnResourceType, theMethod, theContext, theProvider); - this.myQueryName = StringUtils.defaultIfBlank(theQueryName, null); + Search search = theMethod.getAnnotation(Search.class); + this.myQueryName = StringUtils.defaultIfBlank(search.queryName(), null); + this.myCompartmentName = StringUtils.defaultIfBlank(search.compartmentName(), null); this.myDeclaredResourceType = (Class) theMethod.getReturnType(); + this.myIdParamIndex = MethodUtil.findIdParameterIndex(theMethod); Description desc = theMethod.getAnnotation(Description.class); if (desc != null) { @@ -77,13 +87,17 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { SearchParameter sp = (SearchParameter) next; if (sp.getName().startsWith("_")) { if (ALLOWED_PARAMS.contains(sp.getName())) { - String msg = getContext().getLocalizer().getMessage(getClass().getName() + ".invalidSpecialParamName", theMethod.getName(), theMethod.getDeclaringClass().getSimpleName(), - sp.getName()); + String msg = getContext().getLocalizer().getMessage(getClass().getName() + ".invalidSpecialParamName", theMethod.getName(), theMethod.getDeclaringClass().getSimpleName(), sp.getName()); throw new ConfigurationException(msg); } } } + if (isBlank(myCompartmentName) && myIdParamIndex != null) { + String msg = theContext.getLocalizer().getMessage(getClass().getName() + ".idWithoutCompartment", theMethod.getName(), theMethod.getDeclaringClass()); + throw new ConfigurationException(msg); + } + } public String getDescription() { @@ -110,7 +124,7 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { } @Override - public HttpGetClientInvocation invokeClient(Object[] theArgs) throws InternalErrorException { + public BaseHttpClientInvocation invokeClient(Object[] theArgs) throws InternalErrorException { assert (myQueryName == null || ((theArgs != null ? theArgs.length : 0) == getParameters().size())) : "Wrong number of arguments: " + (theArgs != null ? theArgs.length : "null"); Map> queryStringArgs = new LinkedHashMap>(); @@ -119,8 +133,10 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { queryStringArgs.put(Constants.PARAM_QUERY, Collections.singletonList(myQueryName)); } + IdDt id = (IdDt) (myIdParamIndex != null ? theArgs[myIdParamIndex] : null); + String resourceName = getResourceName(); - HttpGetClientInvocation retVal = createSearchInvocation(resourceName, queryStringArgs); + BaseHttpClientInvocation retVal = createSearchInvocation(getContext(), resourceName, queryStringArgs, id, myCompartmentName, null); if (theArgs != null) { for (int idx = 0; idx < theArgs.length; idx++) { @@ -132,13 +148,68 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { return retVal; } - public static HttpGetClientInvocation createSearchInvocation(String theResourceName, Map> theParameters) { - return new HttpGetClientInvocation(theParameters, theResourceName); + public static BaseHttpClientInvocation createSearchInvocation(FhirContext theContext, String theResourceName, Map> theParameters, IdDt theId, String theCompartmentName, SearchStyleEnum theSearchStyle) { + SearchStyleEnum searchStyle = theSearchStyle; + if (searchStyle == null) { + int length = 0; + for (Entry> nextEntry : theParameters.entrySet()) { + length += nextEntry.getKey().length(); + for (String next : nextEntry.getValue()) { + length += next.length(); + } + } + + if (length < 5000) { + searchStyle = SearchStyleEnum.GET; + } else { + searchStyle = SearchStyleEnum.POST; + } + } + + BaseHttpClientInvocation invocation; + + boolean compartmentSearch = false; + if (theCompartmentName != null) { + if (theId == null || !theId.hasIdPart()) { + String msg = theContext.getLocalizer().getMessage(SearchMethodBinding.class.getName() + ".idNullForCompartmentSearch"); + throw new InvalidRequestException(msg); + } else { + compartmentSearch = true; + } + } + + switch (searchStyle) { + case GET: + default: + if (compartmentSearch) { + invocation = new HttpGetClientInvocation(theParameters, theResourceName, theId.getIdPart(), theCompartmentName); + } else { + invocation = new HttpGetClientInvocation(theParameters, theResourceName); + } + break; + case GET_WITH_SEARCH: + if (compartmentSearch) { + invocation = new HttpGetClientInvocation(theParameters, theResourceName, theId.getIdPart(), theCompartmentName, Constants.PARAM_SEARCH); + } else { + invocation = new HttpGetClientInvocation(theParameters, theResourceName, Constants.PARAM_SEARCH); + } + break; + case POST: + if (compartmentSearch) { + invocation = new HttpPostClientInvocation(theContext, theParameters, theResourceName, theId.getIdPart(), theCompartmentName, Constants.PARAM_SEARCH); + } else { + invocation = new HttpPostClientInvocation(theContext, theParameters, theResourceName, Constants.PARAM_SEARCH); + } + } + + return invocation; } @Override public IBundleProvider invokeServer(RequestDetails theRequest, Object[] theMethodParams) throws InvalidRequestException, InternalErrorException { - assert theRequest.getId() == null; + if (myIdParamIndex != null) { + theMethodParams[myIdParamIndex] = theRequest.getId(); + } Object response = invokeServerMethod(theMethodParams); @@ -152,8 +223,8 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { ourLog.trace("Method {} doesn't match because resource name {} != {}", getMethod().getName(), theRequest.getResourceName(), getResourceName()); return false; } - if (theRequest.getId() != null) { - ourLog.trace("Method {} doesn't match because IDis not null: {}", theRequest.getId()); + if (theRequest.getId() != null && myIdParamIndex == null) { + ourLog.trace("Method {} doesn't match because ID is not null: {}", theRequest.getId()); return false; } if (theRequest.getRequestType() == RequestType.GET && theRequest.getOperation() != null && !Constants.PARAM_SEARCH.equals(theRequest.getOperation())) { @@ -165,10 +236,13 @@ public class SearchMethodBinding extends BaseResourceReturningMethodBinding { return false; } if (theRequest.getRequestType() != RequestType.GET && theRequest.getRequestType() != RequestType.POST) { - ourLog.trace("Method {} doesn't match because request type is {}", theRequest.getOperation()); + ourLog.trace("Method {} doesn't match because request type is {}", getMethod()); + return false; + } + if (!StringUtils.equals(myCompartmentName, theRequest.getCompartmentName())) { + ourLog.trace("Method {} doesn't match because it is for compartment {} but request is compartment {}", new Object[] { getMethod(), myCompartmentName, theRequest.getCompartmentName() }); return false; } - // This is used to track all the parameters so we can reject queries that // have additional params we don't understand Set methodParamsTemp = new HashSet(); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SortParameter.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SortParameter.java index 788f8589ade..805ca935b2e 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SortParameter.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/SortParameter.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionMethodBinding.java index f382a6c7956..ecf8cade8a8 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/TransactionMethodBinding.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.lang.reflect.Method; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java index 12bbc5bf08c..ac998095380 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.method; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.lang.reflect.Method; import java.util.Collections; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeParam.java index feefa99a426..558e9b36ace 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/CompositeParam.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.param; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberParam.java index e58ad32304e..000fa6753eb 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/NumberParam.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.param; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.math.BigDecimal; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java index 4745abbb13b..a581b6144ae 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QuantityParam.java @@ -20,8 +20,8 @@ package ca.uhn.fhir.rest.param; * #L% */ -import static ca.uhn.fhir.rest.param.ParameterUtil.escape; -import static org.apache.commons.lang3.StringUtils.defaultString; +import static ca.uhn.fhir.rest.param.ParameterUtil.*; +import static org.apache.commons.lang3.StringUtils.*; import java.math.BigDecimal; import java.util.List; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceParam.java index c8d93432235..54cc7c0ee42 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ReferenceParam.java @@ -20,8 +20,7 @@ package ca.uhn.fhir.rest.param; * #L% */ -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.model.api.IResource; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringParam.java index 0813f01cac1..e946fa43d15 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringParam.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.param; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultString; +import static org.apache.commons.lang3.StringUtils.*; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java index b98fc6f889d..c956454cd21 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java @@ -20,8 +20,7 @@ package ca.uhn.fhir.rest.param; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultString; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java index 1dac21a48fc..e0ee887c12a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java @@ -20,7 +20,7 @@ package ca.uhn.fhir.rest.server; * #L% */ -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.OutputStreamWriter; @@ -469,6 +469,7 @@ public class RestfulServer extends HttpServlet { IdDt id = null; String operation = null; + String compartment = null; String requestPath = requestFullPath.substring(escapedLength(servletContextPath) + escapedLength(servletPath)); if (requestPath.length() > 0 && requestPath.charAt(0) == '/') { @@ -533,6 +534,8 @@ public class RestfulServer extends HttpServlet { throw new InvalidRequestException("URL Path contains two operations (part beginning with _): " + requestPath); } operation = nextString; + } else { + compartment = nextString; } } @@ -582,6 +585,7 @@ public class RestfulServer extends HttpServlet { r.setServletRequest(theRequest); r.setServletResponse(theResponse); r.setRespondGzip(respondGzip); + r.setCompartmentName(compartment); String pagingAction = theRequest.getParameter(Constants.PARAM_PAGINGACTION); if (getPagingProvider() != null && isNotBlank(pagingAction)) { 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 65fbfb543fb..d98212e65d9 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 @@ -1,2 +1,4 @@ -ca.uhn.fhir.rest.method.SearchMethodBinding.invalidSpecialParamName=Method [{0}] in provider [{1}] contains search parameter annotated to use name [{2}] - This name is reserved according to the FHIR specification and can not be used as a search parameter name. \ No newline at end of file +ca.uhn.fhir.rest.method.SearchMethodBinding.invalidSpecialParamName=Method [{0}] in provider [{1}] contains search parameter annotated to use name [{2}] - This name is reserved according to the FHIR specification and can not be used as a search parameter name. +ca.uhn.fhir.rest.method.SearchMethodBinding.idWithoutCompartment=Method [{0}] in provider [{1}] has an @IdParam parameter. This is only allowable for compartment search (e.g. @Search(compartment="foo") ) +ca.uhn.fhir.rest.method.SearchMethodBinding.idNullForCompartmentSearch=ID parameter can not be null or empty for compartment search \ No newline at end of file diff --git a/hapi-fhir-base/src/site/xdoc/doc_rest_client.xml b/hapi-fhir-base/src/site/xdoc/doc_rest_client.xml index 1255d3bcbf3..bd6c806ea7c 100644 --- a/hapi-fhir-base/src/site/xdoc/doc_rest_client.xml +++ b/hapi-fhir-base/src/site/xdoc/doc_rest_client.xml @@ -163,6 +163,19 @@ + +

Search - Compartments

+ + + + + diff --git a/hapi-fhir-base/src/site/xdoc/doc_rest_operations.xml b/hapi-fhir-base/src/site/xdoc/doc_rest_operations.xml index 5ee8c6e8eb5..d223da98d2c 100644 --- a/hapi-fhir-base/src/site/xdoc/doc_rest_operations.xml +++ b/hapi-fhir-base/src/site/xdoc/doc_rest_operations.xml @@ -23,6 +23,9 @@
  • Tags
    • +
  • + Compartments +

    • @@ -1479,6 +1482,39 @@ + + + + + + + +

    + +

    + FHIR defines a mechanism for logically grouping + resources together called compartments. +

    +

    + To define a search by compartment, you simply need to add the compartmentName attribute + to the @Search annotation, and add an @IdParam parameter. +

    +

    + The following example shows a search method in a resource provider which returns + a compartment. Note that you may also add @RequiredParam and + @OptionalParam parameters to your compartment search method. +

    + + + + + +

    + Example URL to invoke this method: +
    + http://fhir.example.com/Patient/123/fooCompartment +

    +
    diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/context/ModelExtensionTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/context/ModelExtensionTest.java index d593c274a09..c45d3f1d51a 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/context/ModelExtensionTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/context/ModelExtensionTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.context; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import org.junit.Test; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/model/primitive/CodingDtTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/model/primitive/CodingDtTest.java index 9f55fc5fe2c..32639296ac4 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/model/primitive/CodingDtTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/model/primitive/CodingDtTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.model.primitive; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import org.junit.Test; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorTest.java index 19683c9edc1..05b4131a903 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorTest.java @@ -26,7 +26,6 @@ import ca.uhn.fhir.model.dstu.resource.Patient; import ca.uhn.fhir.model.dstu.valueset.DiagnosticReportStatusEnum; import ca.uhn.fhir.model.dstu.valueset.EncounterClassEnum; import ca.uhn.fhir.model.dstu.valueset.EncounterTypeEnum; -import ca.uhn.fhir.model.dstu.valueset.IssueSeverityEnum; import ca.uhn.fhir.model.dstu.valueset.ObservationStatusEnum; import ca.uhn.fhir.model.primitive.DateTimeDt; import ca.uhn.fhir.model.primitive.StringDt; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java index 920f0cbeb65..05d4c8c5fbd 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java @@ -1,17 +1,9 @@ package ca.uhn.fhir.parser; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.stringContainsInOrder; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.Matchers.*; +import static org.mockito.Mockito.*; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java index cb19614e268..579a0218afa 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ClientTest.java @@ -1,9 +1,8 @@ package ca.uhn.fhir.rest.client; -import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; import java.io.InputStream; import java.io.StringReader; @@ -167,7 +166,8 @@ public class ClientTest { } /** - * Some servers (older ones?) return the resourcde you created instead of an OperationOutcome. We just need to ignore it. + * Some servers (older ones?) return the resourcde you created instead of an OperationOutcome. We just need to + * ignore it. */ @Test public void testCreateWithResourceResponse() throws Exception { @@ -579,12 +579,9 @@ public class ClientTest { ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); when(httpClient.execute(capt.capture())).thenReturn(httpResponse); when(httpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - Header[] headers = new Header[] { - new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), - new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), - new BasicHeader(Constants.HEADER_CATEGORY, "http://foo/tagdefinition.html; scheme=\"http://hl7.org/fhir/tag\"; label=\"Some tag\"") - }; - + Header[] headers = new Header[] { new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), + new BasicHeader(Constants.HEADER_CATEGORY, "http://foo/tagdefinition.html; scheme=\"http://hl7.org/fhir/tag\"; label=\"Some tag\"") }; + when(httpResponse.getAllHeaders()).thenReturn(headers); when(httpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); when(httpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), Charset.forName("UTF-8"))); @@ -596,7 +593,7 @@ public class ClientTest { assertEquals("http://foo/Patient/111", capt.getValue().getURI().toString()); assertEquals("PRP1660", response.getIdentifier().get(0).getValue().getValue()); - + assertEquals("http://foo.com/Patient/123/_history/2333", response.getId().getValue()); InstantDt lm = (InstantDt) response.getResourceMetadata().get(ResourceMetadataKeyEnum.UPDATED); @@ -605,10 +602,10 @@ public class ClientTest { TagList tags = ResourceMetadataKeyEnum.TAG_LIST.get(response); assertNotNull(tags); - assertEquals(1,tags.size()); + assertEquals(1, tags.size()); assertEquals("http://foo/tagdefinition.html", tags.get(0).getTerm()); - assertEquals("http://hl7.org/fhir/tag",tags.get(0).getScheme()); - assertEquals("Some tag",tags.get(0).getLabel()); + assertEquals("http://hl7.org/fhir/tag", tags.get(0).getScheme()); + assertEquals("Some tag", tags.get(0).getLabel()); } @@ -699,8 +696,6 @@ public class ClientTest { } - - @Test public void testSearchByDateRange() throws Exception { @@ -728,14 +723,14 @@ public class ClientTest { String msg = getPatientFeedWithOneResult(); ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - + when(httpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); when(httpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); when(httpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), Charset.forName("UTF-8"))); -// httpResponse = new BasicHttpResponse(statusline, catalog, locale) + // httpResponse = new BasicHttpResponse(statusline, catalog, locale) when(httpClient.execute(capt.capture())).thenReturn(httpResponse); - + ITestClient client = ctx.newRestfulClient(ITestClient.class, "http://foo"); List response = client.getPatientByDob(new DateParam(QuantityCompararatorEnum.GREATERTHAN_OR_EQUALS, "2011-01-02")); @@ -744,6 +739,34 @@ public class ClientTest { } + @Test + public void testSearchByCompartment() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + + when(httpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(httpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(httpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), Charset.forName("UTF-8"))); + + when(httpClient.execute(capt.capture())).thenReturn(httpResponse); + + ITestClient client = ctx.newRestfulClient(ITestClient.class, "http://foo"); + List response = client.getPatientByCompartmentAndDob(new IdDt("123"), new DateParam(QuantityCompararatorEnum.GREATERTHAN_OR_EQUALS, "2011-01-02")); + + assertEquals("http://foo/Patient/123/compartmentName?birthdate=%3E%3D2011-01-02", capt.getValue().getURI().toString()); + assertEquals("PRP1660", response.get(0).getIdentifier().get(0).getValue().getValue()); + + try { + client.getPatientByCompartmentAndDob(new IdDt(""), new DateParam(QuantityCompararatorEnum.GREATERTHAN_OR_EQUALS, "2011-01-02")); + fail(); + } catch (InvalidRequestException e) { + assertThat(e.toString(), containsString("null or empty for compartment")); + } + + } + @Test public void testSearchByQuantity() throws Exception { @@ -956,9 +979,7 @@ public class ClientTest { assertEquals("PRP1660", resource.getIdentifier().get(0).getValue().getValue()); } - - - + @Test public void testSearchByCompositeParam() throws Exception { @@ -975,7 +996,7 @@ public class ClientTest { DateParam date = new DateParam("2001-01-01"); client.getObservationByNameValueDate(new CompositeParam(str, date)); - assertEquals("http://foo/Observation?" + Observation.SP_NAME_VALUE_DATE + "=" + URLEncoder.encode("FOO\\$BAR$2001-01-01","UTF-8"), capt.getValue().getURI().toString()); + assertEquals("http://foo/Observation?" + Observation.SP_NAME_VALUE_DATE + "=" + URLEncoder.encode("FOO\\$BAR$2001-01-01", "UTF-8"), capt.getValue().getURI().toString()); } @@ -1039,11 +1060,11 @@ public class ClientTest { ITestClient client = ctx.newRestfulClient(ITestClient.class, "http://foo"); client.updatePatient(new IdDt("Patient/100/_history/200"), patient); - + assertEquals(HttpPut.class, capt.getValue().getClass()); HttpPut post = (HttpPut) capt.getValue(); assertEquals("http://foo/Patient/100", post.getURI().toASCIIString()); - + Header h = post.getFirstHeader("content-location"); assertEquals("Patient/100/_history/200", h.getValue()); diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java index 64f147e0d58..9ed2e2dc6cc 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java @@ -1,11 +1,8 @@ package ca.uhn.fhir.rest.client; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import java.io.StringReader; import java.net.URLEncoder; @@ -116,6 +113,50 @@ public class GenericClientTest { } + @Test + public void testSearchByCompartment() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), Charset.forName("UTF-8"))); + + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + + IGenericClient client = myCtx.newRestfulGenericClient("http://foo"); + //@formatter:off + Bundle response = client + .search() + .forResource(Patient.class) + .withIdAndCompartment("123", "fooCompartment") + .where(Patient.BIRTHDATE.afterOrEquals().day("2011-01-02")) + .execute(); + //@formatter:on + + assertEquals("http://foo/Patient/123/fooCompartment?birthdate=%3E%3D2011-01-02", capt.getValue().getURI().toString()); + assertEquals("PRP1660", response.getResources(Patient.class).get(0).getIdentifier().get(0).getValue().getValue()); + + try { + //@formatter:off + client + .search() + .forResource(Patient.class) + .withIdAndCompartment("", "fooCompartment") + .where(Patient.BIRTHDATE.afterOrEquals().day("2011-01-02")) + .execute(); + //@formatter:on + fail(); + } catch (InvalidRequestException e) { + assertThat(e.toString(), containsString("null or empty for compartment")); + } + + } + + + @Test public void testCreateWithTag() throws Exception { diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ITestClient.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ITestClient.java index a2408694db3..2b674a7bd99 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ITestClient.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/ITestClient.java @@ -100,4 +100,8 @@ public interface ITestClient extends IBasicClient { @Search(type=Patient.class) Patient findPatientQuantity(@RequiredParam(name="quantityParam") QuantityParam theQuantityDt); + @Search(compartmentName="compartmentName") + public List getPatientByCompartmentAndDob(@IdParam IdDt theIdDt, @RequiredParam(name=Patient.SP_BIRTHDATE) DateParam theBirthDate); + + } diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/IncludedResourceStitchingClientTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/IncludedResourceStitchingClientTest.java index be06c01ad15..a1a1ccc7056 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/IncludedResourceStitchingClientTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/IncludedResourceStitchingClientTest.java @@ -1,9 +1,7 @@ package ca.uhn.fhir.rest.client; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import java.io.StringReader; import java.nio.charset.Charset; @@ -25,7 +23,6 @@ import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.Bundle; import ca.uhn.fhir.model.api.ExtensionDt; -import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.dstu.composite.ResourceReferenceDt; import ca.uhn.fhir.model.dstu.resource.Conformance; import ca.uhn.fhir.model.dstu.resource.Organization; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/InterceptorTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/InterceptorTest.java index 32b376b6014..19be04260fe 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/InterceptorTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/InterceptorTest.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.rest.client; import static org.junit.Assert.*; +import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import org.eclipse.jetty.server.Server; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/SearchTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/SearchTest.java index 9456069ab88..65c3736012e 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/SearchTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/client/SearchTest.java @@ -1,9 +1,7 @@ package ca.uhn.fhir.rest.client; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import java.io.StringReader; import java.nio.charset.Charset; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/CreateTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/CreateTest.java index 32a85991147..d0f5ea9479a 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/CreateTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/CreateTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.rest.server; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.io.StringReader; import java.util.ArrayList; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ExceptionTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ExceptionTest.java index 1ff24d9141b..01a3711ec99 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ExceptionTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ExceptionTest.java @@ -1,8 +1,6 @@ package ca.uhn.fhir.rest.server; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.util.List; import java.util.concurrent.TimeUnit; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/IncludeTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/IncludeTest.java index 264ba048502..60dff56092a 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/IncludeTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/IncludeTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.rest.server; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.Arrays; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/InterceptorTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/InterceptorTest.java index 9c61a5b932b..25b6ee5a649 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/InterceptorTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/InterceptorTest.java @@ -40,7 +40,6 @@ import ca.uhn.fhir.rest.annotation.RequiredParam; import ca.uhn.fhir.rest.annotation.Search; import ca.uhn.fhir.rest.method.RequestDetails; import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; -import ca.uhn.fhir.rest.server.interceptor.LoggingInterceptor; import ca.uhn.fhir.testutil.RandomServerPortProvider; /** diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/MethodPriorityTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/MethodPriorityTest.java index fba54b4dd1e..f67cd305c78 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/MethodPriorityTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/MethodPriorityTest.java @@ -1,7 +1,6 @@ package ca.uhn.fhir.rest.server; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java index 59d0057a69b..49fbe8dfd4e 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResfulServerMethodTest.java @@ -1,10 +1,7 @@ package ca.uhn.fhir.rest.server; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.Arrays; @@ -68,7 +65,6 @@ import ca.uhn.fhir.rest.annotation.RequiredParam; import ca.uhn.fhir.rest.annotation.ResourceParam; import ca.uhn.fhir.rest.annotation.Search; import ca.uhn.fhir.rest.annotation.Validate; -import ca.uhn.fhir.rest.annotation.VersionIdParam; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.param.CodingListParam; import ca.uhn.fhir.rest.param.DateParam; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResourceMethodTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResourceMethodTest.java index a614b82ad31..e7cf6ee3313 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResourceMethodTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ResourceMethodTest.java @@ -13,23 +13,25 @@ import org.junit.Test; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.model.api.Bundle; import ca.uhn.fhir.model.dstu.resource.Patient; +import ca.uhn.fhir.rest.annotation.Search; import ca.uhn.fhir.rest.method.IParameter; import ca.uhn.fhir.rest.method.Request; import ca.uhn.fhir.rest.method.SearchMethodBinding; -import ca.uhn.fhir.rest.method.SearchParameter; import ca.uhn.fhir.rest.method.SearchMethodBinding.RequestType; +import ca.uhn.fhir.rest.method.SearchParameter; public class ResourceMethodTest { private SearchMethodBinding rm; + @Search public Bundle foo() { return null; } @Before public void before() throws NoSuchMethodException, SecurityException { - rm = new SearchMethodBinding(Patient.class, ResourceMethodTest.class.getMethod("foo"), null, new FhirContext(), null); + rm = new SearchMethodBinding(Patient.class, ResourceMethodTest.class.getMethod("foo"), new FhirContext(), null); } @Test diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/SearchTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/SearchTest.java index 10600966d63..dedc3ec6e1d 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/SearchTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/SearchTest.java @@ -1,6 +1,7 @@ package ca.uhn.fhir.rest.server; -import static org.junit.Assert.assertEquals; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; @@ -33,6 +34,7 @@ import ca.uhn.fhir.model.dstu.resource.Observation; import ca.uhn.fhir.model.dstu.resource.Patient; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator; +import ca.uhn.fhir.rest.annotation.IdParam; import ca.uhn.fhir.rest.annotation.OptionalParam; import ca.uhn.fhir.rest.annotation.RequiredParam; import ca.uhn.fhir.rest.annotation.Search; @@ -48,7 +50,9 @@ public class SearchTest { private static CloseableHttpClient ourClient; private static FhirContext ourCtx = new FhirContext(); + private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SearchTest.class); private static int ourPort; + private static Server ourServer; @Test @@ -65,6 +69,27 @@ public class SearchTest { assertEquals(null, p.getNameFirstRep().getFamilyFirstRep().getValue()); } + @Test + public void testReturnLinks() throws Exception { + HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient?_query=findWithLinks"); + + CloseableHttpResponse status = ourClient.execute(httpGet); + String responseContent = IOUtils.toString(status.getEntity().getContent()); + IOUtils.closeQuietly(status.getEntity().getContent()); + assertEquals(200, status.getStatusLine().getStatusCode()); + Bundle bundle = ourCtx.newXmlParser().parseBundle(responseContent); + assertEquals(1, bundle.getEntries().size()); + + Patient p = bundle.getResources(Patient.class).get(0); + assertEquals("AAANamed", p.getIdentifierFirstRep().getValue().getValue()); + assertEquals("http://foo/Patient?_id=1", bundle.getEntries().get(0).getLinkSearch().getValue()); + assertEquals("http://localhost:" + ourPort + "/Patient/9988", bundle.getEntries().get(0).getLinkAlternate().getValue()); + + assertEquals("http://foo/Patient?_id=1", ResourceMetadataKeyEnum.LINK_SEARCH.get(p)); + assertEquals("http://localhost:" + ourPort + "/Patient/9988", ResourceMetadataKeyEnum.LINK_ALTERNATE.get(p)); + + } + @Test public void testSearchById() throws Exception { HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient?_id=aaa"); @@ -79,19 +104,18 @@ public class SearchTest { assertEquals("idaaa", p.getNameFirstRep().getFamilyAsSingleString()); assertEquals("IDAAA (identifier123)", bundle.getEntries().get(0).getTitle().getValue()); } - - + @Test public void testSearchByPost() throws Exception { HttpPost filePost = new HttpPost("http://localhost:" + ourPort + "/Patient/_search"); - // add parameters to the post method - List parameters = new ArrayList (); - parameters.add(new BasicNameValuePair("_id", "aaa")); - - UrlEncodedFormEntity sendentity = new UrlEncodedFormEntity(parameters, "UTF-8"); - filePost.setEntity(sendentity); - + // add parameters to the post method + List parameters = new ArrayList(); + parameters.add(new BasicNameValuePair("_id", "aaa")); + + UrlEncodedFormEntity sendentity = new UrlEncodedFormEntity(parameters, "UTF-8"); + filePost.setEntity(sendentity); + HttpResponse status = ourClient.execute(filePost); String responseContent = IOUtils.toString(status.getEntity().getContent()); IOUtils.closeQuietly(status.getEntity().getContent()); @@ -104,10 +128,26 @@ public class SearchTest { assertEquals("IDAAA (identifier123)", bundle.getEntries().get(0).getTitle().getValue()); } + @Test + public void testSearchCompartment() throws Exception { + HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/123/fooCompartment"); + HttpResponse status = ourClient.execute(httpGet); + String responseContent = IOUtils.toString(status.getEntity().getContent()); + ourLog.info(responseContent); + IOUtils.closeQuietly(status.getEntity().getContent()); + assertEquals(200, status.getStatusLine().getStatusCode()); + Bundle bundle = ourCtx.newXmlParser().parseBundle(responseContent); + assertEquals(1, bundle.getEntries().size()); + + Patient p = bundle.getResources(Patient.class).get(0); + assertEquals("fooCompartment", p.getIdentifierFirstRep().getValue().getValue()); + assertThat(bundle.getEntries().get(0).getId().getValue(), containsString("Patient/123")); + } + @Test public void testSearchGetWithUnderscoreSearch() throws Exception { - HttpGet httpGet = new HttpGet("http://localhost:" + ourPort+"/Observation/_search?subject%3APatient=100&name=3141-9%2C8302-2%2C8287-5%2C39156-5"); - + HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Observation/_search?subject%3APatient=100&name=3141-9%2C8302-2%2C8287-5%2C39156-5"); + HttpResponse status = ourClient.execute(httpGet); String responseContent = IOUtils.toString(status.getEntity().getContent()); IOUtils.closeQuietly(status.getEntity().getContent()); @@ -120,13 +160,13 @@ public class SearchTest { assertEquals(4, p.getName().getCoding().size()); assertEquals("3141-9", p.getName().getCoding().get(0).getCode().getValue()); assertEquals("8302-2", p.getName().getCoding().get(1).getCode().getValue()); - + } - + @Test public void testSpecificallyNamedQueryGetsPrecedence() throws Exception { - HttpGet httpGet = new HttpGet("http://localhost:" + ourPort+"/Patient?AAA=123"); - + HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient?AAA=123"); + HttpResponse status = ourClient.execute(httpGet); String responseContent = IOUtils.toString(status.getEntity().getContent()); IOUtils.closeQuietly(status.getEntity().getContent()); @@ -138,9 +178,9 @@ public class SearchTest { assertEquals("AAA", p.getIdentifierFirstRep().getValue().getValue()); // Now the named query - - httpGet = new HttpGet("http://localhost:" + ourPort+"/Patient?_query=findPatientByAAA&AAA=123"); - + + httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient?_query=findPatientByAAA&AAA=123"); + status = ourClient.execute(httpGet); responseContent = IOUtils.toString(status.getEntity().getContent()); IOUtils.closeQuietly(status.getEntity().getContent()); @@ -151,30 +191,7 @@ public class SearchTest { p = bundle.getResources(Patient.class).get(0); assertEquals("AAANamed", p.getIdentifierFirstRep().getValue().getValue()); } - - @Test - public void testReturnLinks() throws Exception { - HttpGet httpGet = new HttpGet("http://localhost:" + ourPort+"/Patient?_query=findWithLinks"); - - CloseableHttpResponse status = ourClient.execute(httpGet); - String responseContent = IOUtils.toString(status.getEntity().getContent()); - IOUtils.closeQuietly(status.getEntity().getContent()); - assertEquals(200, status.getStatusLine().getStatusCode()); - Bundle bundle = ourCtx.newXmlParser().parseBundle(responseContent); - assertEquals(1, bundle.getEntries().size()); - Patient p = bundle.getResources(Patient.class).get(0); - assertEquals("AAANamed", p.getIdentifierFirstRep().getValue().getValue()); - assertEquals("http://foo/Patient?_id=1", bundle.getEntries().get(0).getLinkSearch().getValue()); - assertEquals("http://localhost:" + ourPort+"/Patient/9988", bundle.getEntries().get(0).getLinkAlternate().getValue()); - - assertEquals("http://foo/Patient?_id=1", ResourceMetadataKeyEnum.LINK_SEARCH.get(p)); - assertEquals("http://localhost:" + ourPort+"/Patient/9988", ResourceMetadataKeyEnum.LINK_ALTERNATE.get(p)); - - - } - - @AfterClass public static void afterClass() throws Exception { ourServer.stop(); @@ -204,15 +221,15 @@ public class SearchTest { } - public static class DummyObservationResourceProvider implements IResourceProvider{ + public static class DummyObservationResourceProvider implements IResourceProvider { @Override public Class getResourceType() { return Observation.class; } - + @Search - public Observation search(@RequiredParam(name="subject") ReferenceParam theSubject, @RequiredParam(name="name") TokenOrListParam theName) { + public Observation search(@RequiredParam(name = "subject") ReferenceParam theSubject, @RequiredParam(name = "name") TokenOrListParam theName) { Observation o = new Observation(); o.setId("1"); @@ -220,17 +237,28 @@ public class SearchTest { for (CodingDt next : theName.getListAsCodings()) { o.getName().getCoding().add(next); } - + return o; } - + } /** * Created by dsotnikov on 2/25/2014. */ public static class DummyPatientResourceProvider implements IResourceProvider { - + + @Search(compartmentName = "fooCompartment") + public List compartment(@IdParam IdDt theId) { + ArrayList retVal = new ArrayList(); + + Patient patient = new Patient(); + patient.setId(theId); + patient.addIdentifier("system", "fooCompartment"); + retVal.add(patient); + return retVal; + } + @Search public List findPatient(@RequiredParam(name = "_id") StringParam theParam) { ArrayList retVal = new ArrayList(); @@ -256,7 +284,7 @@ public class SearchTest { return retVal; } - @Search(queryName="findPatientByAAA") + @Search(queryName = "findPatientByAAA") public List findPatientByAAA02Named(@OptionalParam(name = "AAA") StringParam theParam) { ArrayList retVal = new ArrayList(); @@ -267,7 +295,7 @@ public class SearchTest { return retVal; } - @Search(queryName="findWithLinks") + @Search(queryName = "findWithLinks") public List findWithLinks() { ArrayList retVal = new ArrayList(); diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerConformanceProviderTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerConformanceProviderTest.java index 1156f4956d8..a8129bd94a2 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerConformanceProviderTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerConformanceProviderTest.java @@ -3,7 +3,6 @@ package ca.uhn.fhir.rest.server; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; -import java.lang.annotation.Documented; import java.util.Collection; import java.util.List; import java.util.Set; @@ -18,7 +17,6 @@ import ca.uhn.fhir.model.dstu.resource.Conformance; import ca.uhn.fhir.model.dstu.resource.Conformance.Rest; import ca.uhn.fhir.model.dstu.resource.Conformance.RestQuery; import ca.uhn.fhir.model.dstu.resource.Conformance.RestResource; -import ca.uhn.fhir.model.dstu.resource.Conformance.RestResourceSearchParam; import ca.uhn.fhir.model.dstu.resource.DiagnosticReport; import ca.uhn.fhir.model.dstu.resource.Patient; import ca.uhn.fhir.model.primitive.StringDt; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerExtraParametersTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerExtraParametersTest.java index 0997900c4d0..60136772d6b 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerExtraParametersTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerExtraParametersTest.java @@ -1,8 +1,6 @@ package ca.uhn.fhir.rest.server; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.util.Arrays; import java.util.Collections; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerInvalidDefinitionTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerInvalidDefinitionTest.java index 6de73851f92..75cdfb8b5fb 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerInvalidDefinitionTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/ServerInvalidDefinitionTest.java @@ -1,7 +1,6 @@ package ca.uhn.fhir.rest.server; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.util.List; @@ -76,6 +75,20 @@ public class ServerInvalidDefinitionTest { } } + @Test + public void testSearchWithId() { + RestfulServer srv = new RestfulServer(); + srv.setResourceProviders(new SearchWithIdParamProvider()); + + try { + srv.init(); + fail(); + } catch (ServletException e) { + assertThat(e.getCause().toString(), StringContains.containsString("ConfigurationException")); + assertThat(e.getCause().toString(), StringContains.containsString("compartment")); + } + } + /** * Normal, should initialize properly */ @@ -118,6 +131,22 @@ public class ServerInvalidDefinitionTest { } + public static class SearchWithIdParamProvider implements IResourceProvider + { + + @Override + public Class getResourceType() { + return Patient.class; + } + + @SuppressWarnings("unused") + @Search + public List read(@IdParam IdDt theId, @RequiredParam(name="aaa") StringParam theParam) { + return null; + } + + } + public static class NonInstantiableTypeForResourceProvider implements IResourceProvider { diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/StringParameterTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/StringParameterTest.java index d9f16c11d57..4c1d19666c7 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/StringParameterTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/StringParameterTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.rest.server; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/UpdateTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/UpdateTest.java index bf0b5450f63..ca3e11f2e29 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/UpdateTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/UpdateTest.java @@ -1,7 +1,6 @@ package ca.uhn.fhir.rest.server; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.Assert.*; import java.util.concurrent.TimeUnit; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/exceptions/ExceptionTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/exceptions/ExceptionTest.java index 25501c901b3..3f5d16f0f5f 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/exceptions/ExceptionTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/exceptions/ExceptionTest.java @@ -2,15 +2,9 @@ package ca.uhn.fhir.rest.server.exceptions; import static org.junit.Assert.*; -import java.io.IOException; - import org.junit.Test; -import org.mockito.internal.matchers.GreaterThan; import ca.uhn.fhir.model.dstu.resource.OperationOutcome; -import ca.uhn.fhir.rest.server.exceptions.AuthenticationException; -import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; -import ca.uhn.fhir.rest.server.exceptions.UnclassifiedServerFailureException; import com.google.common.collect.ImmutableSet; import com.google.common.reflect.ClassPath; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/interceptor/LoggingInterceptorTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/interceptor/LoggingInterceptorTest.java index 778fcff593b..1c8d6953419 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/interceptor/LoggingInterceptorTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/server/interceptor/LoggingInterceptorTest.java @@ -1,12 +1,7 @@ package ca.uhn.fhir.rest.server.interceptor; import static org.junit.Assert.*; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; import java.util.Collections; import java.util.HashMap; @@ -14,9 +9,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; @@ -34,7 +26,6 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.slf4j.Logger; -import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.dstu.composite.HumanNameDt; import ca.uhn.fhir.model.dstu.composite.IdentifierDt; import ca.uhn.fhir.model.dstu.resource.Patient; @@ -45,7 +36,6 @@ import ca.uhn.fhir.rest.annotation.IdParam; import ca.uhn.fhir.rest.annotation.Read; import ca.uhn.fhir.rest.annotation.RequiredParam; import ca.uhn.fhir.rest.annotation.Search; -import ca.uhn.fhir.rest.method.RequestDetails; import ca.uhn.fhir.rest.server.IResourceProvider; import ca.uhn.fhir.rest.server.RestfulServer; import ca.uhn.fhir.testutil.RandomServerPortProvider; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/testmodel/IdentifierDt.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/testmodel/IdentifierDt.java index c6a99208192..766fe8141e3 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/testmodel/IdentifierDt.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/testmodel/IdentifierDt.java @@ -18,7 +18,6 @@ package ca.uhn.fhir.testmodel; import java.util.List; -import ca.uhn.fhir.model.api.BaseElement; import ca.uhn.fhir.model.api.BaseIdentifiableElement; import ca.uhn.fhir.model.api.ICompositeDatatype; import ca.uhn.fhir.model.api.IElement; diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/validation/ResourceValidatorTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/validation/ResourceValidatorTest.java index dbc87a97e1d..e61b1329867 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/validation/ResourceValidatorTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/validation/ResourceValidatorTest.java @@ -1,9 +1,7 @@ package ca.uhn.fhir.validation; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import java.io.IOException; diff --git a/hapi-tinder-test/src/test/java/test/TestParticulars.java b/hapi-tinder-test/src/test/java/test/TestParticulars.java index 073b30293b8..b4b8fc52066 100644 --- a/hapi-tinder-test/src/test/java/test/TestParticulars.java +++ b/hapi-tinder-test/src/test/java/test/TestParticulars.java @@ -9,7 +9,7 @@ public class TestParticulars { @Test public void testElementsWithSpecialNames() { - // This won't compile if tinder didn't getenerate the right names... + // This won't compile if tinder didn't generate the right names... ListResource.class.getName(); ObjectElement.class.getName(); } diff --git a/restful-server-example/.settings/org.eclipse.wst.common.component b/restful-server-example/.settings/org.eclipse.wst.common.component index 263e87f0f0d..e2cd387d6d8 100644 --- a/restful-server-example/.settings/org.eclipse.wst.common.component +++ b/restful-server-example/.settings/org.eclipse.wst.common.component @@ -6,7 +6,7 @@ uses - + consumes

    + To search a + resource compartment, + simply use the withIdAndCompartment + method in your search. +