diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java index db264ea6ee1..5dd67fd5921 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java @@ -20,6 +20,7 @@ package ca.uhn.fhir.context; * #L% */ +import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collections; @@ -35,6 +36,8 @@ import ca.uhn.fhir.model.api.IValueSetEnumBinder; public abstract class BaseRuntimeElementDefinition { + private static final Class VOID_CLASS = Void.class; + private final String myName; private final Class myImplementingClass; private List myExtensions = new ArrayList(); @@ -42,6 +45,7 @@ public abstract class BaseRuntimeElementDefinition { private List myExtensionsModifier = new ArrayList(); private List myExtensionsNonModifier = new ArrayList(); private final boolean myStandardType; + private Map, Constructor> myConstructors = Collections.synchronizedMap(new HashMap, Constructor>()); public BaseRuntimeElementDefinition(String theName, Class theImplementingClass, boolean theStandardType) { assert StringUtils.isNotBlank(theName); @@ -109,13 +113,9 @@ public abstract class BaseRuntimeElementDefinition { public T newInstance(Object theArgument) { try { if (theArgument == null) { - return getImplementingClass().newInstance(); - } else if (theArgument instanceof IValueSetEnumBinder) { - return getImplementingClass().getConstructor(IValueSetEnumBinder.class).newInstance(theArgument); - } else if (theArgument instanceof IBaseEnumFactory) { - return getImplementingClass().getConstructor(IBaseEnumFactory.class).newInstance(theArgument); + return getConstructor(null).newInstance(null); } else { - return getImplementingClass().getConstructor(theArgument.getClass()).newInstance(theArgument); + return getConstructor(theArgument).newInstance(theArgument); } } catch (InstantiationException e) { throw new ConfigurationException("Failed to instantiate type:" + getImplementingClass().getName(), e); @@ -125,13 +125,44 @@ public abstract class BaseRuntimeElementDefinition { throw new ConfigurationException("Failed to instantiate type:" + getImplementingClass().getName(), e); } catch (InvocationTargetException e) { throw new ConfigurationException("Failed to instantiate type:" + getImplementingClass().getName(), e); - } catch (NoSuchMethodException e) { - throw new ConfigurationException("Failed to instantiate type:" + getImplementingClass().getName(), e); } catch (SecurityException e) { throw new ConfigurationException("Failed to instantiate type:" + getImplementingClass().getName(), e); } } + @SuppressWarnings("unchecked") + private Constructor getConstructor(Object theArgument) { + + Class argumentType; + if (theArgument == null) { + argumentType = VOID_CLASS; + } else { + argumentType = theArgument.getClass(); + } + + Constructor retVal = myConstructors.get(argumentType); + if (retVal == null) { + for (Constructor next : getImplementingClass().getConstructors()) { + if (argumentType == VOID_CLASS) { + if (next.getParameterTypes().length == 0) { + retVal = (Constructor) next; + break; + } + } else if (next.getParameterTypes().length == 1) { + if (next.getParameterTypes()[0].isAssignableFrom(argumentType)) { + retVal = (Constructor) next; + break; + } + } + } + if (retVal == null) { + throw new ConfigurationException("Class " + getImplementingClass() + " has no constructor with a single argument of type " + argumentType); + } + myConstructors.put(argumentType, retVal); + } + return retVal; + } + public Class getImplementingClass() { return myImplementingClass; } 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 3edf4771e45..17dc8f9d060 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 @@ -802,7 +802,7 @@ class ModelScanner { } } catch (ClassNotFoundException e) { - ourLog.error("Unknown class[" + nextValue + "] for data type definition: " + nextKey.substring("datatype.".length()), e); + throw new ConfigurationException("Unknown class[" + nextValue + "] for data type definition: " + nextKey.substring("datatype.".length()), e); } } } else if (nextKey.startsWith("resource.")) { @@ -812,16 +812,15 @@ class ModelScanner { @SuppressWarnings("unchecked") Class nextClass = (Class) Class.forName(nextValue); if (!IBaseResource.class.isAssignableFrom(nextClass)) { - ourLog.warn("Class is not assignable from " + IBaseResource.class.getSimpleName() + ": " + nextValue); - continue; + throw new ConfigurationException("Class is not assignable from " + IBaseResource.class.getSimpleName() + ": " + nextValue); } theResourceTypes.put(resName, nextClass); } catch (ClassNotFoundException e) { - ourLog.error("Unknown class[" + nextValue + "] for resource definition: " + nextKey.substring("resource.".length()), e); + throw new ConfigurationException("Unknown class[" + nextValue + "] for resource definition: " + nextKey.substring("resource.".length()), e); } } else { - ourLog.warn("Unexpected property in version property file: {}={}", nextKey, nextValue); + throw new ConfigurationException("Unexpected property in version property file: " + nextKey + "=" + nextValue); } } } catch (IOException e) { 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 e7bf9a6061d..bad9d79a106 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 @@ -560,7 +560,7 @@ public class IdDt extends UriDt implements IPrimitiveDatatype, IIdType { if (theResouce == null) { throw new NullPointerException("theResource can not be null"); } else if (theResouce instanceof IBaseResource) { - IIdType retVal = ((IBaseResource) theResouce).getId(); + IIdType retVal = ((IBaseResource) theResouce).getIdElement(); if (retVal == null) { return null; } else if (retVal instanceof IdDt) { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java index 4dd1b58de9b..ac0215555cf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/BaseParser.java @@ -96,7 +96,7 @@ public abstract class BaseParser implements IParser { } else if (theTarget instanceof IDomainResource) { List containedResources = ((IDomainResource) theTarget).getContained(); for (IRefImplResource next : containedResources) { - String nextId = next.getId().getValue(); + String nextId = next.getIdElement().getValue(); if (StringUtils.isNotBlank(nextId)) { if (!nextId.startsWith("#")) { nextId = '#' + nextId; @@ -117,7 +117,7 @@ public abstract class BaseParser implements IParser { for (IBaseReference next : allElements) { IBaseResource resource = next.getResource(); if (resource != null) { - if (resource.getId().isEmpty() || resource.getId().isLocal()) { + if (resource.getIdElement().isEmpty() || resource.getIdElement().isLocal()) { theContained.addContained(resource); } else { continue; @@ -156,11 +156,11 @@ public abstract class BaseParser implements IParser { } else { reference = "#" + containedId.getValue(); } - } else if (theRef.getResource().getId() != null && theRef.getResource().getId().hasIdPart()) { + } else if (theRef.getResource().getIdElement() != null && theRef.getResource().getIdElement().hasIdPart()) { if (isStripVersionsFromReferences()) { - reference = theRef.getResource().getId().toVersionless().getValue(); + reference = theRef.getResource().getIdElement().toVersionless().getValue(); } else { - reference = theRef.getResource().getId().getValue(); + reference = theRef.getResource().getIdElement().getValue(); } } } @@ -284,7 +284,7 @@ public abstract class BaseParser implements IParser { if (base != null && base.size() > 0) { IPrimitiveType baseType = (IPrimitiveType) base.get(0); IBaseResource res = ((IBaseResource) retVal); - res.setId(new IdDt(baseType.getValueAsString(), def.getName(), res.getId().getIdPart(), res.getId().getVersionIdPart())); + res.setId(new IdDt(baseType.getValueAsString(), def.getName(), res.getIdElement().getIdPart(), res.getIdElement().getVersionIdPart())); } BaseRuntimeChildDefinition entryChild = def.getChildByName("entry"); @@ -305,12 +305,12 @@ public abstract class BaseParser implements IParser { if (entryResources != null && entryResources.size() > 0) { IBaseResource res = (IBaseResource) entryResources.get(0); RuntimeResourceDefinition resDef = myContext.getResourceDefinition(res); - String versionIdPart = res.getId().getVersionIdPart(); + String versionIdPart = res.getIdElement().getVersionIdPart(); if (isBlank(versionIdPart) && res instanceof IResource) { versionIdPart = ResourceMetadataKeyEnum.VERSION.get((IResource) res); } - res.setId(new IdDt(baseType.getValueAsString(), resDef.getName(), res.getId().getIdPart(), versionIdPart)); + res.setId(new IdDt(baseType.getValueAsString(), resDef.getName(), res.getIdElement().getIdPart(), versionIdPart)); } } @@ -399,8 +399,8 @@ public abstract class BaseParser implements IParser { } IIdType newId; - if (theResource.getId().isLocal()) { - newId = theResource.getId(); + if (theResource.getIdElement().isLocal()) { + newId = theResource.getIdElement(); } else { // TODO: make this configurable between the two below (and something else?) // newId = new IdDt(UUID.randomUUID().toString()); 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 9515650cb2e..1105e3b7214 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 @@ -678,8 +678,8 @@ public class JsonParser extends BaseParser implements IParser { } } else if (theResource instanceof IRefImplResource) { IRefImplResource res = (IRefImplResource) theResource; - if (/*theContainedResource && */ StringUtils.isNotBlank(res.getId().getIdPart())) { - resourceId = res.getId().getIdPart(); + if (/*theContainedResource && */ StringUtils.isNotBlank(res.getIdElement().getIdPart())) { + resourceId = res.getIdElement().getIdPart(); } } @@ -1096,7 +1096,7 @@ public class JsonParser extends BaseParser implements IParser { if (object instanceof IIdentifiableElement) { ((IIdentifiableElement) object).setElementSpecificId(elementId); } else if (object instanceof IBaseResource) { - ((IBaseResource) object).getId().setValue(elementId); + ((IBaseResource) object).getIdElement().setValue(elementId); } } } 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 5c3f6904e21..0d76e8dbfcd 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 @@ -1383,12 +1383,12 @@ class ParserState { public void wereBack() { IBaseResource res = getCurrentElement(); assert res != null; - if (res.getId() == null || res.getId().isEmpty()) { + if (res.getIdElement() == null || res.getIdElement().isEmpty()) { ourLog.debug("Discarding contained resource with no ID!"); } else { - getPreResourceState().getContainedResources().put(res.getId().getValue(), res); - if (!res.getId().isLocal()) { - res.getId().setValue('#' + res.getId().getIdPart()); + getPreResourceState().getContainedResources().put(res.getIdElement().getValue(), res); + if (!res.getIdElement().isLocal()) { + res.getIdElement().setValue('#' + res.getIdElement().getIdPart()); } } @@ -1955,12 +1955,12 @@ class ParserState { IDomainResource elem = (IDomainResource) getCurrentElement(); String resourceName = myContext.getResourceDefinition(elem).getName(); String versionId = elem.getMeta().getVersionId(); - if (StringUtils.isBlank(elem.getId().getIdPart())) { + if (StringUtils.isBlank(elem.getIdElement().getIdPart())) { // Resource has no ID } else if (StringUtils.isNotBlank(versionId)) { - elem.getIdElement().setValue(resourceName + "/" + elem.getId().getIdPart() + "/_history/" + versionId); + elem.getIdElement().setValue(resourceName + "/" + elem.getIdElement().getIdPart() + "/_history/" + versionId); } else { - elem.getIdElement().setValue(resourceName + "/" + elem.getId().getIdPart()); + elem.getIdElement().setValue(resourceName + "/" + elem.getIdElement().getIdPart()); } } } 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 c692e9b79a2..1e1a0af5684 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 @@ -752,8 +752,8 @@ public class XmlParser extends BaseParser implements IParser { } else { // HL7 structs IRefImplResource resource = (IRefImplResource) theResource; - if (StringUtils.isNotBlank(resource.getId().getIdPart())) { - resourceId = resource.getId().getIdPart(); + if (StringUtils.isNotBlank(resource.getIdElement().getIdPart())) { + resourceId = resource.getIdElement().getIdPart(); } } 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 34c9c41d25f..82177395ae5 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 @@ -283,7 +283,7 @@ public class GenericClient extends BaseClient implements IGenericClient { if (isNotBlank(theId)) { return theId; } - return theResource.getId().getIdPart(); + return theResource.getIdElement().getIdPart(); } @Override @@ -1709,7 +1709,7 @@ public class GenericClient extends BaseClient implements IGenericClient { invocation = MethodUtil.createUpdateInvocation(myContext, myResource, myResourceBody, myCriterionList.toParamList()); } else { if (myId == null) { - myId = myResource.getId(); + myId = myResource.getIdElement(); } if (myId == null || myId.hasIdPart() == false) { throw new InvalidRequestException("No ID supplied for resource to update, can not invoke server"); 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 ba3eb31aee2..fdcf9157587 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 @@ -190,10 +190,10 @@ public class HistoryMethodBinding extends BaseResourceReturningMethodBinding { List retVal = resources.getResources(theFromIndex, theToIndex); int index = theFromIndex; for (IBaseResource nextResource : retVal) { - if (nextResource.getId() == null || isBlank(nextResource.getId().getIdPart())) { + if (nextResource.getIdElement() == null || isBlank(nextResource.getIdElement().getIdPart())) { throw new InternalErrorException("Server provided resource at index " + index + " with no ID set (using IResource#setId(IdDt))"); } - if (isBlank(nextResource.getId().getVersionIdPart()) && nextResource instanceof IResource) { + if (isBlank(nextResource.getIdElement().getVersionIdPart()) && nextResource instanceof IResource) { IdDt versionId = (IdDt) ResourceMetadataKeyEnum.VERSION_ID.get((IResource) nextResource); if (versionId == null || versionId.isEmpty()) { throw new InternalErrorException("Server provided resource at index " + index + " with no Version ID set (using IResource#setId(IdDt))"); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java index a3589cac2f1..d0689224baf 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java @@ -209,8 +209,8 @@ public class ReadMethodBinding extends BaseResourceReturningMethodBinding implem IBaseResource responseResource = responseResources.get(0); ifNoneMatch = MethodUtil.parseETagValue(ifNoneMatch); - if (responseResource.getId() != null && responseResource.getId().hasVersionIdPart()) { - if (responseResource.getId().getVersionIdPart().equals(ifNoneMatch)) { + if (responseResource.getIdElement() != null && responseResource.getIdElement().hasVersionIdPart()) { + if (responseResource.getIdElement().getVersionIdPart().equals(ifNoneMatch)) { ourLog.debug("Returning HTTP 301 because request specified {}={}", Constants.HEADER_IF_NONE_MATCH, ifNoneMatch); throw new NotModifiedException("Not Modified"); } 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 8b2143a7aae..e1bdf52f665 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 @@ -166,14 +166,14 @@ public class TransactionMethodBinding extends BaseResourceReturningMethodBinding for (int i = 0; i < retResources.size(); i++) { IdDt oldId = oldIds.get(retResources.get(i)); IBaseResource newRes = retResources.get(i); - if (newRes.getId() == null || newRes.getId().isEmpty()) { + if (newRes.getIdElement() == null || newRes.getIdElement().isEmpty()) { if (!(newRes instanceof BaseOperationOutcome)) { throw new InternalErrorException("Transaction method returned resource at index " + i + " with no id specified - IResource#setId(IdDt)"); } } if (oldId != null && !oldId.isEmpty()) { - if (!oldId.equals(newRes.getId()) && newRes instanceof IResource) { + if (!oldId.equals(newRes.getIdElement()) && newRes instanceof IResource) { ((IResource)newRes).getResourceMetadata().put(ResourceMetadataKeyEnum.PREVIOUS_ID, oldId); } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/Dstu1BundleFactory.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/Dstu1BundleFactory.java index 3a9642f78c3..0e758418bf0 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/Dstu1BundleFactory.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/Dstu1BundleFactory.java @@ -68,8 +68,8 @@ public class Dstu1BundleFactory implements IVersionSpecificBundleFactory { Set addedResourceIds = new HashSet(); for (IBaseResource next : theResult) { - if (next.getId().isEmpty() == false) { - addedResourceIds.add((IdDt) next.getId()); + if (next.getIdElement().isEmpty() == false) { + addedResourceIds.add((IdDt) next.getIdElement()); } } @@ -184,7 +184,7 @@ public class Dstu1BundleFactory implements IVersionSpecificBundleFactory { } for (IBaseResource next : resourceList) { - if (next.getId() == null || next.getId().isEmpty()) { + if (next.getIdElement() == null || next.getIdElement().isEmpty()) { if (!(next instanceof BaseOperationOutcome)) { throw new InternalErrorException("Server method returned resource of type[" + next.getClass().getSimpleName() + "] with no ID specified (IResource#setId(IdDt) must be called)"); } @@ -271,8 +271,8 @@ public class Dstu1BundleFactory implements IVersionSpecificBundleFactory { Set addedResourceIds = new HashSet(); for (IBaseResource next : theResult) { - if (next.getId().isEmpty() == false) { - addedResourceIds.add(next.getId()); + if (next.getIdElement().isEmpty() == false) { + addedResourceIds.add(next.getIdElement()); } } @@ -303,13 +303,13 @@ public class Dstu1BundleFactory implements IVersionSpecificBundleFactory { for (BaseResourceReferenceDt nextRef : references) { IBaseResource nextRefRes = (IBaseResource) nextRef.getResource(); if (nextRefRes != null) { - if (nextRefRes.getId().hasIdPart()) { - if (containedIds.contains(nextRefRes.getId().getValue())) { + if (nextRefRes.getIdElement().hasIdPart()) { + if (containedIds.contains(nextRefRes.getIdElement().getValue())) { // Don't add contained IDs as top level resources continue; } - IIdType id = nextRefRes.getId(); + IIdType id = nextRefRes.getIdElement(); if (id.hasResourceType() == false) { String resName = myContext.getResourceDefinition(nextRefRes).getName(); id = id.withResourceType(resName); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java index 8bcfd328170..33daf07b0fe 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java @@ -79,15 +79,15 @@ public class RestfulServerUtils { boolean theRequestIsBrowser, RestfulServer.NarrativeModeEnum theNarrativeMode, int stausCode, boolean theRespondGzip, String theServerBase, boolean theAddContentLocationHeader) throws IOException { theHttpResponse.setStatus(stausCode); - if (theAddContentLocationHeader && theResource.getId() != null && theResource.getId().hasIdPart() && isNotBlank(theServerBase)) { + if (theAddContentLocationHeader && theResource.getIdElement() != null && theResource.getIdElement().hasIdPart() && isNotBlank(theServerBase)) { String resName = theServer.getFhirContext().getResourceDefinition(theResource).getName(); - IIdType fullId = theResource.getId().withServerBase(theServerBase, resName); + IIdType fullId = theResource.getIdElement().withServerBase(theServerBase, resName); theHttpResponse.addHeader(Constants.HEADER_CONTENT_LOCATION, fullId.getValue()); } if (theServer.getETagSupport() == ETagSupportEnum.ENABLED) { - if (theResource.getId().hasVersionIdPart()) { - theHttpResponse.addHeader(Constants.HEADER_ETAG, "W/\"" + theResource.getId().getVersionIdPart() + '"'); + if (theResource.getIdElement().hasVersionIdPart()) { + theHttpResponse.addHeader(Constants.HEADER_ETAG, "W/\"" + theResource.getIdElement().getVersionIdPart() + '"'); } } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java index b055e997d58..1b69e6ed40f 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java @@ -246,7 +246,7 @@ public class FhirTerser { IBaseReference resRefDt = (IBaseReference) theElement; if (resRefDt.getReferenceElement().getValue() == null && resRefDt.getResource() != null) { IBaseResource theResource = resRefDt.getResource(); - if (theResource.getId() == null || theResource.getId().isEmpty() || theResource.getId().isLocal()) { + if (theResource.getIdElement() == null || theResource.getIdElement().isEmpty() || theResource.getIdElement().isLocal()) { BaseRuntimeElementCompositeDefinition def = myContext.getResourceDefinition(theResource); visit(theResource, pathToElement, null, def, theCallback); } @@ -341,7 +341,7 @@ public class FhirTerser { IBaseReference resRefDt = (IBaseReference) theElement; if (resRefDt.getReferenceElement().getValue() == null && resRefDt.getResource() != null) { IBaseResource theResource = resRefDt.getResource(); - if (theResource.getId() == null || theResource.getId().isEmpty() || theResource.getId().isLocal()) { + if (theResource.getIdElement() == null || theResource.getIdElement().isEmpty() || theResource.getIdElement().isLocal()) { BaseRuntimeElementCompositeDefinition def = myContext.getResourceDefinition(theResource); visit(theResource, null, def, theCallback, theContainingElementPath, theChildDefinitionPath, theElementDefinitionPath); } diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseExtension.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseExtension.java index e3a488b0b69..ffeab05f244 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseExtension.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseExtension.java @@ -22,7 +22,7 @@ package org.hl7.fhir.instance.model.api; import java.util.List; -public interface IBaseExtension extends ICompositeType { +public interface IBaseExtension extends ICompositeType { List getExtension(); diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseResource.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseResource.java index 78cf8825de0..801eb2f7262 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseResource.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseResource.java @@ -31,7 +31,7 @@ package org.hl7.fhir.instance.model.api; */ public interface IBaseResource extends IBase { - IIdType getId(); + IIdType getIdElement(); IBaseResource setId(String theId); diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IRefImplResource.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IRefImplResource.java index 329cead96c2..ba5c892c2f4 100644 --- a/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IRefImplResource.java +++ b/hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IRefImplResource.java @@ -23,7 +23,7 @@ package org.hl7.fhir.instance.model.api; public interface IRefImplResource extends IBaseResource { - IIdType getId(); + String getId(); IRefImplResource setId(String theId); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseFhirResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseFhirResourceDao.java index fe2d76658d6..268a59a96ad 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseFhirResourceDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseFhirResourceDao.java @@ -1697,7 +1697,7 @@ public abstract class BaseFhirResourceDao extends BaseFhirD if (theParams.getIncludes() != null && theParams.getIncludes().isEmpty() == false) { Set previouslyLoadedPids = new HashSet(); for (IBaseResource next : retVal) { - previouslyLoadedPids.add(next.getId().toUnqualifiedVersionless()); + previouslyLoadedPids.add(next.getIdElement().toUnqualifiedVersionless()); } Set includePids = new HashSet(); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2Test.java index 69fd179a2c6..548aa6b213d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2Test.java @@ -112,7 +112,7 @@ public class FhirResourceDaoDstu2Test { { IBundleProvider found = ourObservationDao.search(Observation.SP_VALUE_CONCEPT, new TokenParam("testChoiceParam01CCS", "testChoiceParam01CCV")); assertEquals(1, found.size()); - assertEquals(id1, found.getResources(0, 1).get(0).getId()); + assertEquals(id1, found.getResources(0, 1).get(0).getIdElement()); } } @@ -126,7 +126,7 @@ public class FhirResourceDaoDstu2Test { { IBundleProvider found = ourObservationDao.search(Observation.SP_VALUE_DATE, new DateParam("2001-01-02")); assertEquals(1, found.size()); - assertEquals(id2, found.getResources(0, 1).get(0).getId()); + assertEquals(id2, found.getResources(0, 1).get(0).getIdElement()); } } @@ -157,7 +157,7 @@ public class FhirResourceDaoDstu2Test { { IBundleProvider found = ourObservationDao.search(Observation.SP_VALUE_QUANTITY, new QuantityParam(">100", "foo", "bar")); assertEquals(1, found.size()); - assertEquals(id3, found.getResources(0, 1).get(0).getId()); + assertEquals(id3, found.getResources(0, 1).get(0).getIdElement()); } { IBundleProvider found = ourObservationDao.search(Observation.SP_VALUE_QUANTITY, new QuantityParam("<100", "foo", "bar")); @@ -166,12 +166,12 @@ public class FhirResourceDaoDstu2Test { { IBundleProvider found = ourObservationDao.search(Observation.SP_VALUE_QUANTITY, new QuantityParam("123.0001", "foo", "bar")); assertEquals(1, found.size()); - assertEquals(id3, found.getResources(0, 1).get(0).getId()); + assertEquals(id3, found.getResources(0, 1).get(0).getIdElement()); } { IBundleProvider found = ourObservationDao.search(Observation.SP_VALUE_QUANTITY, new QuantityParam("~120", "foo", "bar")); assertEquals(1, found.size()); - assertEquals(id3, found.getResources(0, 1).get(0).getId()); + assertEquals(id3, found.getResources(0, 1).get(0).getIdElement()); } } @@ -186,7 +186,7 @@ public class FhirResourceDaoDstu2Test { { IBundleProvider found = ourObservationDao.search(Observation.SP_VALUE_STRING, new StringParam("testChoiceParam04Str")); assertEquals(1, found.size()); - assertEquals(id4, found.getResources(0, 1).get(0).getId()); + assertEquals(id4, found.getResources(0, 1).get(0).getIdElement()); } } @@ -1191,7 +1191,7 @@ public class FhirResourceDaoDstu2Test { CompositeParam val = new CompositeParam(v0, v1); IBundleProvider result = ourObservationDao.search(Observation.SP_CODE_VALUE_STRING, val); assertEquals(1, result.size()); - assertEquals(id1.toUnqualifiedVersionless(), result.getResources(0, 1).get(0).getId().toUnqualifiedVersionless()); + assertEquals(id1.toUnqualifiedVersionless(), result.getResources(0, 1).get(0).getIdElement().toUnqualifiedVersionless()); } { TokenParam v0 = new TokenParam("foo", "testSearchCompositeParamN01"); @@ -1199,7 +1199,7 @@ public class FhirResourceDaoDstu2Test { CompositeParam val = new CompositeParam(v0, v1); IBundleProvider result = ourObservationDao.search(Observation.SP_CODE_VALUE_STRING, val); assertEquals(1, result.size()); - assertEquals(id2.toUnqualifiedVersionless(), result.getResources(0, 1).get(0).getId().toUnqualifiedVersionless()); + assertEquals(id2.toUnqualifiedVersionless(), result.getResources(0, 1).get(0).getIdElement().toUnqualifiedVersionless()); } } @@ -1221,7 +1221,7 @@ public class FhirResourceDaoDstu2Test { CompositeParam val = new CompositeParam(v0, v1); IBundleProvider result = ourObservationDao.search(Observation.SP_CODE_VALUE_DATE, val); assertEquals(1, result.size()); - assertEquals(id1.toUnqualifiedVersionless(), result.getResources(0, 1).get(0).getId().toUnqualifiedVersionless()); + assertEquals(id1.toUnqualifiedVersionless(), result.getResources(0, 1).get(0).getIdElement().toUnqualifiedVersionless()); } { TokenParam v0 = new TokenParam("foo", "testSearchCompositeParamDateN01"); @@ -2355,8 +2355,8 @@ public class FhirResourceDaoDstu2Test { assertEquals(2, historyBundle.size()); List history = historyBundle.getResources(0, 2); - assertEquals("1", history.get(1).getId().getVersionIdPart()); - assertEquals("2", history.get(0).getId().getVersionIdPart()); + assertEquals("1", history.get(1).getIdElement().getVersionIdPart()); + assertEquals("2", history.get(0).getIdElement().getVersionIdPart()); assertEquals(published, ResourceMetadataKeyEnum.PUBLISHED.get((IResource) history.get(1))); assertEquals(published, ResourceMetadataKeyEnum.PUBLISHED.get((IResource) history.get(1))); assertEquals(updated, ResourceMetadataKeyEnum.UPDATED.get((IResource) history.get(1))); @@ -2506,7 +2506,7 @@ public class FhirResourceDaoDstu2Test { private List toUnqualifiedVersionlessIds(IBundleProvider theFound) { List retVal = new ArrayList(); for (IBaseResource next : theFound.getResources(0, theFound.size())) { - retVal.add((IdDt) next.getId().toUnqualifiedVersionless()); + retVal.add((IdDt) next.getIdElement().toUnqualifiedVersionless()); } return retVal; } @@ -2543,13 +2543,13 @@ public class FhirResourceDaoDstu2Test { IBundleProvider value = ourDeviceDao.search(new SearchParameterMap()); ourLog.info("Initial size: " + value.size()); for (IBaseResource next : value.getResources(0, value.size())) { - ourLog.info("Deleting: {}", next.getId()); - ourDeviceDao.delete((IdDt) next.getId()); + ourLog.info("Deleting: {}", next.getIdElement()); + ourDeviceDao.delete((IdDt) next.getIdElement()); } value = ourDeviceDao.search(new SearchParameterMap()); if (value.size() > 0) { - ourLog.info("Found: " + (value.getResources(0, 1).get(0).getId())); + ourLog.info("Found: " + (value.getResources(0, 1).get(0).getIdElement())); fail(ourFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(value.getResources(0, 1).get(0))); } assertEquals(0, value.size()); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu1Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu1Test.java index d82a1a126b4..92d9aaffa03 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu1Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu1Test.java @@ -96,10 +96,10 @@ public class FhirSystemDaoDstu1Test { assertEquals(4, values.size()); List res = values.getResources(0, 4); - assertEquals(newpid3, res.get(0).getId()); - assertEquals(newpid2, res.get(1).getId()); - assertEquals(newpid, res.get(2).getId()); - assertEquals(pid.toUnqualifiedVersionless(), res.get(3).getId().toUnqualifiedVersionless()); + assertEquals(newpid3, res.get(0).getIdElement()); + assertEquals(newpid2, res.get(1).getIdElement()); + assertEquals(newpid, res.get(2).getIdElement()); + assertEquals(pid.toUnqualifiedVersionless(), res.get(3).getIdElement().toUnqualifiedVersionless()); Location loc = new Location(); loc.getAddress().addLine("AAA"); @@ -148,7 +148,7 @@ public class FhirSystemDaoDstu1Test { IBundleProvider patResults = ourPatientDao.search(Patient.SP_IDENTIFIER, new IdentifierDt("urn:system", "testPersistWithSimpleLinkP01")); assertEquals(1, obsResults.size()); - IIdType foundPatientId = patResults.getResources(0, 1).get(0).getId(); + IIdType foundPatientId = patResults.getResources(0, 1).get(0).getIdElement(); ResourceReferenceDt subject = obs.getSubject(); assertEquals(foundPatientId.getIdPart(), subject.getReference().getIdPart()); @@ -376,12 +376,12 @@ public class FhirSystemDaoDstu1Test { List existing = results.getResources(0, 3); p1 = new Patient(); - p1.setId(existing.get(0).getId()); + p1.setId(existing.get(0).getIdElement()); ResourceMetadataKeyEnum.DELETED_AT.put(p1, InstantDt.withCurrentTime()); res.add(p1); p2 = new Patient(); - p2.setId(existing.get(1).getId()); + p2.setId(existing.get(1).getIdElement()); ResourceMetadataKeyEnum.DELETED_AT.put(p2, InstantDt.withCurrentTime()); res.add(p2); @@ -394,7 +394,7 @@ public class FhirSystemDaoDstu1Test { IBundleProvider results2 = ourPatientDao.search(Patient.SP_IDENTIFIER, new TokenParam("urn:system", "testTransactionWithDelete")); assertEquals(1, results2.size()); List existing2 = results2.getResources(0, 1); - assertEquals(existing2.get(0).getId(), existing.get(2).getId()); + assertEquals(existing2.get(0).getIdElement(), existing.get(2).getIdElement()); } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu2Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu2Test.java index ed19ab10b58..388095d142f 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu2Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirSystemDaoDstu2Test.java @@ -802,11 +802,11 @@ public class FhirSystemDaoDstu2Test { List allRes = all.getResources(0, all.size()); for (IBaseResource iResource : allRes) { if (ResourceMetadataKeyEnum.DELETED_AT.get((IResource) iResource) == null) { - ourLog.info("Deleting: {}", iResource.getId()); + ourLog.info("Deleting: {}", iResource.getIdElement()); Bundle b = new Bundle(); b.setType(BundleTypeEnum.TRANSACTION); - String url = iResource.getId().toVersionless().getValue(); + String url = iResource.getIdElement().toVersionless().getValue(); b.addEntry().getTransaction().setMethod(HTTPVerbEnum.DELETE).setUrl(url); systemDao.transaction(b); } diff --git a/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/resource/BaseResource.java b/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/resource/BaseResource.java index 57cb816627e..6717acb5b2f 100644 --- a/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/resource/BaseResource.java +++ b/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/resource/BaseResource.java @@ -91,6 +91,11 @@ public abstract class BaseResource extends BaseElement implements IResource { return myId; } + @Override + public IIdType getIdElement() { + return getId(); + } + @Override public CodeDt getLanguage() { if (myLanguage == null) { diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/ServerInvalidDefinitionTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/ServerInvalidDefinitionTest.java index b78b17520b2..934eaad4f0c 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/ServerInvalidDefinitionTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/ServerInvalidDefinitionTest.java @@ -216,6 +216,11 @@ public class ServerInvalidDefinitionTest { return null; } + @Override + public IIdType getIdElement() { + return getId(); + } + @Override public ContainedDt getContained() { return null; diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java index c7331cc8649..be525cbc766 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/resource/BaseResource.java @@ -91,6 +91,11 @@ public abstract class BaseResource extends BaseElement implements IResource { return myId; } + @Override + public IIdType getIdElement() { + return getId(); + } + @Override public CodeDt getLanguage() { if (myLanguage == null) { diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java index e778e0af0e2..d1288dbe243 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2/Dstu2BundleFactory.java @@ -74,8 +74,8 @@ public class Dstu2BundleFactory implements IVersionSpecificBundleFactory { Set addedResourceIds = new HashSet(); for (IBaseResource next : theResult) { - if (next.getId().isEmpty() == false) { - addedResourceIds.add((IdDt) next.getId()); + if (next.getIdElement().isEmpty() == false) { + addedResourceIds.add((IdDt) next.getIdElement()); } } @@ -229,7 +229,7 @@ public class Dstu2BundleFactory implements IVersionSpecificBundleFactory { } for (IBaseResource next : resourceList) { - if (next.getId() == null || next.getId().isEmpty()) { + if (next.getIdElement() == null || next.getIdElement().isEmpty()) { if (!(next instanceof BaseOperationOutcome)) { throw new InternalErrorException("Server method returned resource of type[" + next.getClass().getSimpleName() + "] with no ID specified (IResource#setId(IdDt) must be called)"); } @@ -317,8 +317,8 @@ public class Dstu2BundleFactory implements IVersionSpecificBundleFactory { Set addedResourceIds = new HashSet(); for (IBaseResource next : theResult) { - if (next.getId().isEmpty() == false) { - addedResourceIds.add(next.getId()); + if (next.getIdElement().isEmpty() == false) { + addedResourceIds.add(next.getIdElement()); } } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java index 50294d02507..2429da8e357 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/ca/uhn/fhir/rest/server/provider/dstu2hl7org/Dstu2Hl7OrgBundleFactory.java @@ -81,8 +81,8 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory { Set addedResourceIds = new HashSet(); for (IBaseResource next : theResult) { - if (next.getId().isEmpty() == false) { - addedResourceIds.add(next.getId()); + if (next.getIdElement().isEmpty() == false) { + addedResourceIds.add(next.getIdElement()); } } @@ -95,7 +95,7 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory { Set containedIds = new HashSet(); for (IRefImplResource nextContained : next.getContained()) { if (nextContained.getId().isEmpty() == false) { - containedIds.add(nextContained.getId().getValue()); + containedIds.add(nextContained.getIdElement().getValue()); } } @@ -109,13 +109,13 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory { IBaseResource nextRes = (IBaseResource) nextRefInfo.getResourceReference().getResource(); if (nextRes != null) { - if (nextRes.getId().hasIdPart()) { - if (containedIds.contains(nextRes.getId().getValue())) { + if (nextRes.getIdElement().hasIdPart()) { + if (containedIds.contains(nextRes.getIdElement().getValue())) { // Don't add contained IDs as top level resources continue; } - IdType id = (IdType) nextRes.getId(); + IdType id = (IdType) nextRes.getIdElement(); if (id.hasResourceType() == false) { String resName = myContext.getResourceDefinition(nextRes).getName(); id = id.withResourceType(resName); @@ -227,7 +227,7 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory { } for (IBaseResource next : resourceList) { - if (next.getId() == null || next.getId().isEmpty()) { + if (next.getIdElement() == null || next.getIdElement().isEmpty()) { if (!(next instanceof OperationOutcome)) { throw new InternalErrorException("Server method returned resource of type[" + next.getClass().getSimpleName() + "] with no ID specified (IBaseResource#setId(IdDt) must be called)"); } @@ -294,15 +294,15 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory { BundleEntryComponent nextEntry = myBundle.addEntry(); nextEntry.setResource((Resource) next); - if (next.getId().isEmpty()) { + if (next.getIdElement().isEmpty()) { nextEntry.getTransaction().setMethod(HttpVerb.POST); } else { nextEntry.getTransaction().setMethod(HttpVerb.PUT); - if (next.getId().isAbsolute()) { - nextEntry.getTransaction().setUrl(next.getId().getValue()); + if (next.getIdElement().isAbsolute()) { + nextEntry.getTransaction().setUrl(next.getIdElement().getValue()); } else { String resourceType = myContext.getResourceDefinition(next).getName(); - nextEntry.getTransaction().setUrl(new IdType(theServerBase, resourceType, next.getId().getIdPart(), next.getId().getVersionIdPart()).getValue()); + nextEntry.getTransaction().setUrl(new IdType(theServerBase, resourceType, next.getIdElement().getIdPart(), next.getIdElement().getVersionIdPart()).getValue()); } } } @@ -318,8 +318,8 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory { Set addedResourceIds = new HashSet(); for (IBaseResource next : theResult) { - if (next.getId().isEmpty() == false) { - addedResourceIds.add(next.getId()); + if (next.getIdElement().isEmpty() == false) { + addedResourceIds.add(next.getIdElement()); } } @@ -327,8 +327,8 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory { IDomainResource next = (IDomainResource) nextBaseRes; Set containedIds = new HashSet(); for (IBaseResource nextContained : next.getContained()) { - if (nextContained.getId().isEmpty() == false) { - containedIds.add(nextContained.getId().getValue()); + if (nextContained.getIdElement().isEmpty() == false) { + containedIds.add(nextContained.getIdElement().getValue()); } } @@ -339,13 +339,13 @@ public class Dstu2Hl7OrgBundleFactory implements IVersionSpecificBundleFactory { for (IBaseReference nextRef : references) { IBaseResource nextRes = (IBaseResource) nextRef.getResource(); if (nextRes != null) { - if (nextRes.getId().hasIdPart()) { - if (containedIds.contains(nextRes.getId().getValue())) { + if (nextRes.getIdElement().hasIdPart()) { + if (containedIds.contains(nextRes.getIdElement().getValue())) { // Don't add contained IDs as top level resources continue; } - IIdType id = nextRes.getId(); + IIdType id = nextRes.getIdElement(); if (id.hasResourceType() == false) { String resName = myContext.getResourceDefinition(nextRes).getName(); id = id.withResourceType(resName); diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java index 9446d679ad3..1e4acb94985 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * There is a variety of postal address formats defined around the world. This format defines a superset that is the basis for all addresses around the world. @@ -203,6 +204,9 @@ P.O. Box number, delivery hints, and similar address information. private static final long serialVersionUID = -470351694L; + /* + * Constructor + */ public Address() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java index c30ff0aef75..00467e7424f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Age.java @@ -29,9 +29,10 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java index 1e223fa37f2..5f00db818a1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Risk of harmful or undesirable, physiological response which is unique to an individual and associated with exposure to a substance. @@ -577,7 +577,7 @@ public class AllergyIntolerance extends DomainResource { } @Block() - public static class AllergyIntoleranceEventComponent extends BackboneElement { + public static class AllergyIntoleranceEventComponent extends BackboneElement implements IBaseBackboneElement { /** * Identification of the specific substance considered to be responsible for the Adverse Reaction event. Note: the substance for a specific reaction may be different to the substance identified as the cause of the risk, but must be consistent with it. For instance, it may be a more specific substance (e.g. a brand medication) or a composite substance that includes the identified substance. It must be clinically safe to only process the AllergyIntolerance.substance and ignore the AllergyIntolerance.event.substance. */ @@ -643,6 +643,9 @@ public class AllergyIntolerance extends DomainResource { private static final long serialVersionUID = -1773271720L; + /* + * Constructor + */ public AllergyIntoleranceEventComponent() { super(); } @@ -1179,10 +1182,16 @@ public class AllergyIntolerance extends DomainResource { private static final long serialVersionUID = 410225544L; + /* + * Constructor + */ public AllergyIntolerance() { super(); } + /* + * Constructor + */ public AllergyIntolerance(Reference patient, CodeableConcept substance) { super(); this.patient = patient; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java index 57e963e06e6..4c6ee1f1347 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A booking of a healthcare event among patient(s), practitioner(s), related person(s) and/or device(s) for a specific date/time. This may result in one or more Encounter(s). @@ -361,7 +361,7 @@ public class Appointment extends DomainResource { } @Block() - public static class AppointmentParticipantComponent extends BackboneElement { + public static class AppointmentParticipantComponent extends BackboneElement implements IBaseBackboneElement { /** * Role of participant in the appointment. */ @@ -397,10 +397,16 @@ public class Appointment extends DomainResource { private static final long serialVersionUID = -1009855227L; + /* + * Constructor + */ public AppointmentParticipantComponent() { super(); } + /* + * Constructor + */ public AppointmentParticipantComponent(Enumeration status) { super(); this.status = status; @@ -725,10 +731,16 @@ public class Appointment extends DomainResource { private static final long serialVersionUID = -1809603254L; + /* + * Constructor + */ public Appointment() { super(); } + /* + * Constructor + */ public Appointment(Enumeration status, InstantType start, InstantType end) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java index 4cb24b57eb3..b9231692852 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A reply to an appointment request for a patient and/or practitioner(s), such as a confirmation or rejection. @@ -242,10 +242,16 @@ public class AppointmentResponse extends DomainResource { private static final long serialVersionUID = 152413469L; + /* + * Constructor + */ public AppointmentResponse() { super(); } + /* + * Constructor + */ public AppointmentResponse(Reference appointment, Enumeration participantStatus) { super(); this.appointment = appointment; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java index 58dbbf1b3f1..344477d3ef4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * For referring to data content defined in other formats. @@ -102,6 +103,9 @@ public class Attachment extends Type implements ICompositeType { private static final long serialVersionUID = 581007080L; + /* + * Constructor + */ public Attachment() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java index a638712b5a0..fcd4fa98465 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A record of an event made for purposes of maintaining a security log. Typical uses include detection of intrusion attempts and monitoring for inappropriate usage. @@ -1109,7 +1109,7 @@ public class AuditEvent extends DomainResource { } @Block() - public static class AuditEventEventComponent extends BackboneElement { + public static class AuditEventEventComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifier for a family of the event. */ @@ -1161,10 +1161,16 @@ public class AuditEvent extends DomainResource { private static final long serialVersionUID = 339035171L; + /* + * Constructor + */ public AuditEventEventComponent() { super(); } + /* + * Constructor + */ public AuditEventEventComponent(CodeableConcept type, InstantType dateTime) { super(); this.type = type; @@ -1532,7 +1538,7 @@ public class AuditEvent extends DomainResource { } @Block() - public static class AuditEventParticipantComponent extends BackboneElement { + public static class AuditEventParticipantComponent extends BackboneElement implements IBaseBackboneElement { /** * Specification of the role(s) the user plays when performing the event. Usually the codes used in this element are local codes defined by the role-based access control security system used in the local context. */ @@ -1622,10 +1628,16 @@ public class AuditEvent extends DomainResource { private static final long serialVersionUID = -1555724321L; + /* + * Constructor + */ public AuditEventParticipantComponent() { super(); } + /* + * Constructor + */ public AuditEventParticipantComponent(BooleanType requestor) { super(); this.requestor = requestor; @@ -2167,7 +2179,7 @@ public class AuditEvent extends DomainResource { } @Block() - public static class AuditEventParticipantNetworkComponent extends BackboneElement { + public static class AuditEventParticipantNetworkComponent extends BackboneElement implements IBaseBackboneElement { /** * An identifier for the network access point of the user device for the audit event. */ @@ -2184,6 +2196,9 @@ public class AuditEvent extends DomainResource { private static final long serialVersionUID = -1946856025L; + /* + * Constructor + */ public AuditEventParticipantNetworkComponent() { super(); } @@ -2328,7 +2343,7 @@ public class AuditEvent extends DomainResource { } @Block() - public static class AuditEventSourceComponent extends BackboneElement { + public static class AuditEventSourceComponent extends BackboneElement implements IBaseBackboneElement { /** * Logical source location within the healthcare enterprise network. */ @@ -2352,10 +2367,16 @@ public class AuditEvent extends DomainResource { private static final long serialVersionUID = -382040480L; + /* + * Constructor + */ public AuditEventSourceComponent() { super(); } + /* + * Constructor + */ public AuditEventSourceComponent(StringType identifier) { super(); this.identifier = identifier; @@ -2544,7 +2565,7 @@ public class AuditEvent extends DomainResource { } @Block() - public static class AuditEventObjectComponent extends BackboneElement { + public static class AuditEventObjectComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies a specific instance of the participant object. The reference should always be version specific. */ @@ -2622,6 +2643,9 @@ public class AuditEvent extends DomainResource { private static final long serialVersionUID = 618775596L; + /* + * Constructor + */ public AuditEventObjectComponent() { super(); } @@ -3116,7 +3140,7 @@ public class AuditEvent extends DomainResource { } @Block() - public static class AuditEventObjectDetailComponent extends BackboneElement { + public static class AuditEventObjectDetailComponent extends BackboneElement implements IBaseBackboneElement { /** * Name of the property. */ @@ -3133,10 +3157,16 @@ public class AuditEvent extends DomainResource { private static final long serialVersionUID = 11139504L; + /* + * Constructor + */ public AuditEventObjectDetailComponent() { super(); } + /* + * Constructor + */ public AuditEventObjectDetailComponent(StringType type, Base64BinaryType value) { super(); this.type = type; @@ -3304,10 +3334,16 @@ public class AuditEvent extends DomainResource { private static final long serialVersionUID = -1495151000L; + /* + * Constructor + */ public AuditEvent() { super(); } + /* + * Constructor + */ public AuditEvent(AuditEventEventComponent event, AuditEventSourceComponent source) { super(); this.event = event; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java index 043f5bf9451..f5b8ad5042f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BackboneElement.java @@ -29,13 +29,14 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Base definition for all elements that are defined inside a resource - but not those in a data type. @@ -52,6 +53,9 @@ public abstract class BackboneElement extends Element implements IBaseBackboneEl private static final long serialVersionUID = -1431673179L; + /* + * Constructor + */ public BackboneElement() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseBinary.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseBinary.java new file mode 100644 index 00000000000..d8c4aeb0715 --- /dev/null +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseBinary.java @@ -0,0 +1,24 @@ +package org.hl7.fhir.instance.model; + +import org.hl7.fhir.instance.model.api.IBaseBinary; + +public abstract class BaseBinary extends Resource implements IBaseBinary { + + @Override + public String getContentAsBase64() { + return getContentElement().getValueAsString(); + } + + @Override + public BaseBinary setContentAsBase64(String theContent) { + if (theContent != null) { + getContentElement().setValueAsString(theContent); + } else { + setContent(null); + } + return this; + } + + abstract Base64BinaryType getContentElement(); + +} diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseExtension.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseExtension.java index 6b0bd116f82..9d119880865 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseExtension.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseExtension.java @@ -8,10 +8,10 @@ public abstract class BaseExtension extends Type implements IBaseExtension method, UriType url) { super(); this.method = method; @@ -1365,7 +1383,7 @@ public class Bundle extends Resource implements IBaseBundle { } @Block() - public static class BundleEntryTransactionResponseComponent extends BackboneElement { + public static class BundleEntryTransactionResponseComponent extends BackboneElement implements IBaseBackboneElement { /** * The status code returned by processing this entry. */ @@ -1396,10 +1414,16 @@ public class Bundle extends Resource implements IBaseBundle { private static final long serialVersionUID = -1526413234L; + /* + * Constructor + */ public BundleEntryTransactionResponseComponent() { super(); } + /* + * Constructor + */ public BundleEntryTransactionResponseComponent(StringType status) { super(); this.status = status; @@ -1688,10 +1712,16 @@ public class Bundle extends Resource implements IBaseBundle { private static final long serialVersionUID = -1380125450L; + /* + * Constructor + */ public Bundle() { super(); } + /* + * Constructor + */ public Bundle(Enumeration type) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java index ae919d206e6..1cb6d2cb92b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Describes the intention of how one or more practitioners intend to deliver care for a particular patient for a period of time, possibly limited to care for a specific condition or set of conditions. @@ -403,7 +403,7 @@ public class CarePlan extends DomainResource { } @Block() - public static class CarePlanParticipantComponent extends BackboneElement { + public static class CarePlanParticipantComponent extends BackboneElement implements IBaseBackboneElement { /** * Indicates specific responsibility of an individual within the care plan. E.g. "Primary physician", "Team coordinator", "Caregiver", etc. */ @@ -425,10 +425,16 @@ public class CarePlan extends DomainResource { private static final long serialVersionUID = -466811117L; + /* + * Constructor + */ public CarePlanParticipantComponent() { super(); } + /* + * Constructor + */ public CarePlanParticipantComponent(Reference member) { super(); this.member = member; @@ -539,7 +545,7 @@ public class CarePlan extends DomainResource { } @Block() - public static class CarePlanActivityComponent extends BackboneElement { + public static class CarePlanActivityComponent extends BackboneElement implements IBaseBackboneElement { /** * Resources that describe follow-on actions resulting from the plan, such as drug prescriptions, encounter records, appointments, etc. */ @@ -580,6 +586,9 @@ public class CarePlan extends DomainResource { private static final long serialVersionUID = -1011983328L; + /* + * Constructor + */ public CarePlanActivityComponent() { super(); } @@ -796,7 +805,7 @@ public class CarePlan extends DomainResource { } @Block() - public static class CarePlanActivityDetailComponent extends BackboneElement { + public static class CarePlanActivityDetailComponent extends BackboneElement implements IBaseBackboneElement { /** * High-level categorization of the type of activity in a care plan. */ @@ -917,10 +926,16 @@ public class CarePlan extends DomainResource { private static final long serialVersionUID = -1276666801L; + /* + * Constructor + */ public CarePlanActivityDetailComponent() { super(); } + /* + * Constructor + */ public CarePlanActivityDetailComponent(Enumeration category, BooleanType prohibited) { super(); this.category = category; @@ -1687,10 +1702,16 @@ public class CarePlan extends DomainResource { private static final long serialVersionUID = -1877285959L; + /* + * Constructor + */ public CarePlan() { super(); } + /* + * Constructor + */ public CarePlan(Enumeration status) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java index b21175c6724..9e9194688e0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import java.math.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A provider issued list of services and products provided, or to be provided, to a patient which is provided to an insurer for payment recovery. @@ -262,7 +262,7 @@ public class Claim extends DomainResource { } @Block() - public static class PayeeComponent extends BackboneElement { + public static class PayeeComponent extends BackboneElement implements IBaseBackboneElement { /** * Party to be reimbursed: Subscriber, provider, other. */ @@ -308,6 +308,9 @@ public class Claim extends DomainResource { private static final long serialVersionUID = -503108488L; + /* + * Constructor + */ public PayeeComponent() { super(); } @@ -516,7 +519,7 @@ public class Claim extends DomainResource { } @Block() - public static class DiagnosisComponent extends BackboneElement { + public static class DiagnosisComponent extends BackboneElement implements IBaseBackboneElement { /** * Sequence of diagnosis which serves to order and provide a link. */ @@ -533,10 +536,16 @@ public class Claim extends DomainResource { private static final long serialVersionUID = -795010186L; + /* + * Constructor + */ public DiagnosisComponent() { super(); } + /* + * Constructor + */ public DiagnosisComponent(PositiveIntType sequence, Coding diagnosis) { super(); this.sequence = sequence; @@ -654,7 +663,7 @@ public class Claim extends DomainResource { } @Block() - public static class CoverageComponent extends BackboneElement { + public static class CoverageComponent extends BackboneElement implements IBaseBackboneElement { /** * A service line item. */ @@ -723,10 +732,16 @@ public class Claim extends DomainResource { private static final long serialVersionUID = 621250924L; + /* + * Constructor + */ public CoverageComponent() { super(); } + /* + * Constructor + */ public CoverageComponent(PositiveIntType sequence, BooleanType focal, Reference coverage, Coding relationship) { super(); this.sequence = sequence; @@ -1129,7 +1144,7 @@ public class Claim extends DomainResource { } @Block() - public static class ItemsComponent extends BackboneElement { + public static class ItemsComponent extends BackboneElement implements IBaseBackboneElement { /** * A service line number. */ @@ -1256,10 +1271,16 @@ public class Claim extends DomainResource { private static final long serialVersionUID = -311028698L; + /* + * Constructor + */ public ItemsComponent() { super(); } + /* + * Constructor + */ public ItemsComponent(PositiveIntType sequence, Coding type, Coding service) { super(); this.sequence = sequence; @@ -1971,7 +1992,7 @@ public class Claim extends DomainResource { } @Block() - public static class DetailComponent extends BackboneElement { + public static class DetailComponent extends BackboneElement implements IBaseBackboneElement { /** * A service line number. */ @@ -2044,10 +2065,16 @@ public class Claim extends DomainResource { private static final long serialVersionUID = -1641314433L; + /* + * Constructor + */ public DetailComponent() { super(); } + /* + * Constructor + */ public DetailComponent(PositiveIntType sequence, Coding type, Coding service) { super(); this.sequence = sequence; @@ -2450,7 +2477,7 @@ public class Claim extends DomainResource { } @Block() - public static class SubDetailComponent extends BackboneElement { + public static class SubDetailComponent extends BackboneElement implements IBaseBackboneElement { /** * A service line number. */ @@ -2516,10 +2543,16 @@ public class Claim extends DomainResource { private static final long serialVersionUID = -947666334L; + /* + * Constructor + */ public SubDetailComponent() { super(); } + /* + * Constructor + */ public SubDetailComponent(PositiveIntType sequence, Coding type, Coding service) { super(); this.sequence = sequence; @@ -2876,7 +2909,7 @@ public class Claim extends DomainResource { } @Block() - public static class ProsthesisComponent extends BackboneElement { + public static class ProsthesisComponent extends BackboneElement implements IBaseBackboneElement { /** * Indicates whether this is the initial placement of a fixed prosthesis. */ @@ -2900,6 +2933,9 @@ public class Claim extends DomainResource { private static final long serialVersionUID = 1739349641L; + /* + * Constructor + */ public ProsthesisComponent() { super(); } @@ -3067,7 +3103,7 @@ public class Claim extends DomainResource { } @Block() - public static class MissingTeethComponent extends BackboneElement { + public static class MissingTeethComponent extends BackboneElement implements IBaseBackboneElement { /** * The code identifying which tooth is missing. */ @@ -3091,10 +3127,16 @@ public class Claim extends DomainResource { private static final long serialVersionUID = 352913313L; + /* + * Constructor + */ public MissingTeethComponent() { super(); } + /* + * Constructor + */ public MissingTeethComponent(Coding tooth) { super(); this.tooth = tooth; @@ -3491,10 +3533,16 @@ public class Claim extends DomainResource { private static final long serialVersionUID = 764017933L; + /* + * Constructor + */ public Claim() { super(); } + /* + * Constructor + */ public Claim(Enumeration type, Reference patient) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java index 1fa4697cf3b..7c9abf2c1f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import java.math.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides the adjudication details from the processing of a Claim resource. @@ -120,7 +120,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class ItemsComponent extends BackboneElement { + public static class ItemsComponent extends BackboneElement implements IBaseBackboneElement { /** * A service line number. */ @@ -151,10 +151,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -1917866697L; + /* + * Constructor + */ public ItemsComponent() { super(); } + /* + * Constructor + */ public ItemsComponent(PositiveIntType sequenceLinkId) { super(); this.sequenceLinkId = sequenceLinkId; @@ -400,7 +406,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class ItemAdjudicationComponent extends BackboneElement { + public static class ItemAdjudicationComponent extends BackboneElement implements IBaseBackboneElement { /** * Code indicating: Co-Pay, deductable, elegible, benefit, tax, etc. */ @@ -424,10 +430,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -949880587L; + /* + * Constructor + */ public ItemAdjudicationComponent() { super(); } + /* + * Constructor + */ public ItemAdjudicationComponent(Coding code) { super(); this.code = code; @@ -575,7 +587,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class ItemDetailComponent extends BackboneElement { + public static class ItemDetailComponent extends BackboneElement implements IBaseBackboneElement { /** * A service line number. */ @@ -599,10 +611,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -1751018357L; + /* + * Constructor + */ public ItemDetailComponent() { super(); } + /* + * Constructor + */ public ItemDetailComponent(PositiveIntType sequenceLinkId) { super(); this.sequenceLinkId = sequenceLinkId; @@ -786,7 +804,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class DetailAdjudicationComponent extends BackboneElement { + public static class DetailAdjudicationComponent extends BackboneElement implements IBaseBackboneElement { /** * Code indicating: Co-Pay, deductable, elegible, benefit, tax, etc. */ @@ -810,10 +828,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -949880587L; + /* + * Constructor + */ public DetailAdjudicationComponent() { super(); } + /* + * Constructor + */ public DetailAdjudicationComponent(Coding code) { super(); this.code = code; @@ -961,7 +985,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class SubDetailComponent extends BackboneElement { + public static class SubDetailComponent extends BackboneElement implements IBaseBackboneElement { /** * A service line number. */ @@ -978,10 +1002,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = 1780202110L; + /* + * Constructor + */ public SubDetailComponent() { super(); } + /* + * Constructor + */ public SubDetailComponent(PositiveIntType sequenceLinkId) { super(); this.sequenceLinkId = sequenceLinkId; @@ -1119,7 +1149,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class SubdetailAdjudicationComponent extends BackboneElement { + public static class SubdetailAdjudicationComponent extends BackboneElement implements IBaseBackboneElement { /** * Code indicating: Co-Pay, deductable, elegible, benefit, tax, etc. */ @@ -1143,10 +1173,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -949880587L; + /* + * Constructor + */ public SubdetailAdjudicationComponent() { super(); } + /* + * Constructor + */ public SubdetailAdjudicationComponent(Coding code) { super(); this.code = code; @@ -1294,7 +1330,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class AddedItemComponent extends BackboneElement { + public static class AddedItemComponent extends BackboneElement implements IBaseBackboneElement { /** * List of input service items which this service line is intended to replace. */ @@ -1339,10 +1375,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -1675935854L; + /* + * Constructor + */ public AddedItemComponent() { super(); } + /* + * Constructor + */ public AddedItemComponent(Coding service) { super(); this.service = service; @@ -1655,7 +1697,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class AddedItemAdjudicationComponent extends BackboneElement { + public static class AddedItemAdjudicationComponent extends BackboneElement implements IBaseBackboneElement { /** * Code indicating: Co-Pay, deductable, elegible, benefit, tax, etc. */ @@ -1679,10 +1721,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -949880587L; + /* + * Constructor + */ public AddedItemAdjudicationComponent() { super(); } + /* + * Constructor + */ public AddedItemAdjudicationComponent(Coding code) { super(); this.code = code; @@ -1830,7 +1878,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class AddedItemsDetailComponent extends BackboneElement { + public static class AddedItemsDetailComponent extends BackboneElement implements IBaseBackboneElement { /** * A code to indicate the Professional Service or Product supplied. */ @@ -1854,10 +1902,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -2104242020L; + /* + * Constructor + */ public AddedItemsDetailComponent() { super(); } + /* + * Constructor + */ public AddedItemsDetailComponent(Coding service) { super(); this.service = service; @@ -2000,7 +2054,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class AddedItemDetailAdjudicationComponent extends BackboneElement { + public static class AddedItemDetailAdjudicationComponent extends BackboneElement implements IBaseBackboneElement { /** * Code indicating: Co-Pay, deductable, elegible, benefit, tax, etc. */ @@ -2024,10 +2078,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -949880587L; + /* + * Constructor + */ public AddedItemDetailAdjudicationComponent() { super(); } + /* + * Constructor + */ public AddedItemDetailAdjudicationComponent(Coding code) { super(); this.code = code; @@ -2175,7 +2235,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class ErrorsComponent extends BackboneElement { + public static class ErrorsComponent extends BackboneElement implements IBaseBackboneElement { /** * The sequence number of the line item submitted which contains the error. This value is ommitted when the error is elsewhere. */ @@ -2206,10 +2266,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -1893641175L; + /* + * Constructor + */ public ErrorsComponent() { super(); } + /* + * Constructor + */ public ErrorsComponent(Coding code) { super(); this.code = code; @@ -2424,7 +2490,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class NotesComponent extends BackboneElement { + public static class NotesComponent extends BackboneElement implements IBaseBackboneElement { /** * An integer associated with each note which may be referred to from each service line item. */ @@ -2448,6 +2514,9 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = 1768923951L; + /* + * Constructor + */ public NotesComponent() { super(); } @@ -2615,7 +2684,7 @@ public class ClaimResponse extends DomainResource { } @Block() - public static class CoverageComponent extends BackboneElement { + public static class CoverageComponent extends BackboneElement implements IBaseBackboneElement { /** * A service line item. */ @@ -2684,10 +2753,16 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = 621250924L; + /* + * Constructor + */ public CoverageComponent() { super(); } + /* + * Constructor + */ public CoverageComponent(PositiveIntType sequence, BooleanType focal, Reference coverage, Coding relationship) { super(); this.sequence = sequence; @@ -3293,6 +3368,9 @@ public class ClaimResponse extends DomainResource { private static final long serialVersionUID = -1720247756L; + /* + * Constructor + */ public ClaimResponse() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java index 30a54c5d2e0..37a9e6d0a01 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A record of a clinical assessment performed to determine what problem(s) may affect the patient and before planning the treatments or management strategies that are best to manage a patient's condition. Assessments are often 1:1 with a clinical consultation / encounter, but this varies greatly depending on the clinical workflow. This resource is called "ClinicalImpression" rather than "ClinicalAssessment" to avoid confusion with the recording of assessment tools such as Apgar score. @@ -133,7 +133,7 @@ public class ClinicalImpression extends DomainResource { } @Block() - public static class ClinicalImpressionInvestigationsComponent extends BackboneElement { + public static class ClinicalImpressionInvestigationsComponent extends BackboneElement implements IBaseBackboneElement { /** * A name/code for the group ("set") of investigations. Typically, this will be something like "signs", "symptoms", "clinical", "diagnostic", but the list is not constrained, and others such groups such as (exposure|family|travel|nutitirional) history may be used. */ @@ -155,10 +155,16 @@ public class ClinicalImpression extends DomainResource { private static final long serialVersionUID = -301363326L; + /* + * Constructor + */ public ClinicalImpressionInvestigationsComponent() { super(); } + /* + * Constructor + */ public ClinicalImpressionInvestigationsComponent(CodeableConcept code) { super(); this.code = code; @@ -283,7 +289,7 @@ public class ClinicalImpression extends DomainResource { } @Block() - public static class ClinicalImpressionFindingComponent extends BackboneElement { + public static class ClinicalImpressionFindingComponent extends BackboneElement implements IBaseBackboneElement { /** * Specific text of code for finding or diagnosis. */ @@ -300,10 +306,16 @@ public class ClinicalImpression extends DomainResource { private static final long serialVersionUID = -888590978L; + /* + * Constructor + */ public ClinicalImpressionFindingComponent() { super(); } + /* + * Constructor + */ public ClinicalImpressionFindingComponent(CodeableConcept item) { super(); this.item = item; @@ -424,7 +436,7 @@ public class ClinicalImpression extends DomainResource { } @Block() - public static class ClinicalImpressionRuledOutComponent extends BackboneElement { + public static class ClinicalImpressionRuledOutComponent extends BackboneElement implements IBaseBackboneElement { /** * Specific text of code for diagnosis. */ @@ -441,10 +453,16 @@ public class ClinicalImpression extends DomainResource { private static final long serialVersionUID = -1001661243L; + /* + * Constructor + */ public ClinicalImpressionRuledOutComponent() { super(); } + /* + * Constructor + */ public ClinicalImpressionRuledOutComponent(CodeableConcept item) { super(); this.item = item; @@ -715,10 +733,16 @@ public class ClinicalImpression extends DomainResource { private static final long serialVersionUID = 1650458630L; + /* + * Constructor + */ public ClinicalImpression() { super(); } + /* + * Constructor + */ public ClinicalImpression(Reference patient, Enumeration status) { super(); this.patient = patient; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java index d3d2da0988f..9951985d828 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A concept that may be defined by a formal reference to a terminology or ontology or may be provided by text. @@ -60,6 +61,9 @@ public class CodeableConcept extends Type implements ICompositeType { private static final long serialVersionUID = 760353246L; + /* + * Constructor + */ public CodeableConcept() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java index d229221a161..b712920c168 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A reference to a code defined by a terminology system. @@ -81,6 +82,9 @@ public class Coding extends Type implements IBaseCoding, ICompositeType { private static final long serialVersionUID = 2019442517L; + /* + * Constructor + */ public Coding() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java index b2f7aeee1e5..9e65c255089 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Communication.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * An occurrence of information being transmitted. E.g., an alert that was sent to a responsible provider, a public health agency was notified about a reportable condition. @@ -161,7 +161,7 @@ public class Communication extends DomainResource { } @Block() - public static class CommunicationPayloadComponent extends BackboneElement { + public static class CommunicationPayloadComponent extends BackboneElement implements IBaseBackboneElement { /** * An individual message part for multi-part messages. */ @@ -171,10 +171,16 @@ public class Communication extends DomainResource { private static final long serialVersionUID = -1763459053L; + /* + * Constructor + */ public CommunicationPayloadComponent() { super(); } + /* + * Constructor + */ public CommunicationPayloadComponent(Type content) { super(); this.content = content; @@ -370,6 +376,9 @@ public class Communication extends DomainResource { private static final long serialVersionUID = -744574729L; + /* + * Constructor + */ public Communication() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java index 6cb72c533eb..23510079e99 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CommunicationRequest.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A request to convey information. E.g., the CDS system proposes that an alert be sent to a responsible provider, the CDS system proposes that the public health agency be notified about a reportable condition. @@ -231,7 +231,7 @@ public class CommunicationRequest extends DomainResource { } @Block() - public static class CommunicationRequestPayloadComponent extends BackboneElement { + public static class CommunicationRequestPayloadComponent extends BackboneElement implements IBaseBackboneElement { /** * An individual message part for multi-part messages. */ @@ -241,10 +241,16 @@ public class CommunicationRequest extends DomainResource { private static final long serialVersionUID = -1763459053L; + /* + * Constructor + */ public CommunicationRequestPayloadComponent() { super(); } + /* + * Constructor + */ public CommunicationRequestPayloadComponent(Type content) { super(); this.content = content; @@ -459,6 +465,9 @@ public class CommunicationRequest extends DomainResource { private static final long serialVersionUID = 431529355L; + /* + * Constructor + */ public CommunicationRequest() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java index 951bd39f2c1..8a4a14383b4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A set of healthcare-related information that is assembled together into a single logical document that provides a single coherent statement of meaning, establishes its own context and that has clinical attestation with regard to who is making the statement. @@ -261,7 +261,7 @@ public class Composition extends DomainResource { } @Block() - public static class CompositionAttesterComponent extends BackboneElement { + public static class CompositionAttesterComponent extends BackboneElement implements IBaseBackboneElement { /** * The type of attestation the authenticator offers. */ @@ -290,6 +290,9 @@ public class Composition extends DomainResource { private static final long serialVersionUID = -436604745L; + /* + * Constructor + */ public CompositionAttesterComponent() { super(); } @@ -485,7 +488,7 @@ public class Composition extends DomainResource { } @Block() - public static class CompositionEventComponent extends BackboneElement { + public static class CompositionEventComponent extends BackboneElement implements IBaseBackboneElement { /** * This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the typeCode, such as a "History and Physical Report" in which the procedure being documented is necessarily a "History and Physical" act. */ @@ -514,6 +517,9 @@ public class Composition extends DomainResource { private static final long serialVersionUID = -1581379774L; + /* + * Constructor + */ public CompositionEventComponent() { super(); } @@ -684,7 +690,7 @@ public class Composition extends DomainResource { } @Block() - public static class SectionComponent extends BackboneElement { + public static class SectionComponent extends BackboneElement implements IBaseBackboneElement { /** * The label for this particular section. This will be part of the rendered content for the document, and is often used to build a table of contents. */ @@ -720,6 +726,9 @@ public class Composition extends DomainResource { private static final long serialVersionUID = -1683518435L; + /* + * Constructor + */ public SectionComponent() { super(); } @@ -1051,10 +1060,16 @@ public class Composition extends DomainResource { private static final long serialVersionUID = 2127852326L; + /* + * Constructor + */ public Composition() { super(); } + /* + * Constructor + */ public Composition(DateTimeType date, CodeableConcept type, Enumeration status, Reference subject) { super(); this.date = date; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java index 56ec2600bd2..be942420fed 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A statement of relationships from one set of concepts to one or more other concepts - either code systems or data elements, or classes in class models. @@ -218,7 +218,7 @@ public class ConceptMap extends DomainResource { } @Block() - public static class ConceptMapContactComponent extends BackboneElement { + public static class ConceptMapContactComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of an individual to contact regarding the concept map. */ @@ -235,6 +235,9 @@ public class ConceptMap extends DomainResource { private static final long serialVersionUID = -1179697803L; + /* + * Constructor + */ public ConceptMapContactComponent() { super(); } @@ -374,7 +377,7 @@ public class ConceptMap extends DomainResource { } @Block() - public static class ConceptMapElementComponent extends BackboneElement { + public static class ConceptMapElementComponent extends BackboneElement implements IBaseBackboneElement { /** * An absolute URI that identifies the Code System (if the source is a value value set that crosses more than one code system). */ @@ -405,6 +408,9 @@ public class ConceptMap extends DomainResource { private static final long serialVersionUID = 2079040744L; + /* + * Constructor + */ public ConceptMapElementComponent() { super(); } @@ -642,7 +648,7 @@ public class ConceptMap extends DomainResource { } @Block() - public static class OtherElementComponent extends BackboneElement { + public static class OtherElementComponent extends BackboneElement implements IBaseBackboneElement { /** * A reference to a specific concept that holds a coded value. This can be an element in a FHIR resource, or a specific reference to a data element in a different specification (e.g. v2) or a general reference to a kind of data field, or a reference to a value set with an appropriately narrow definition. */ @@ -666,10 +672,16 @@ public class ConceptMap extends DomainResource { private static final long serialVersionUID = 1488522448L; + /* + * Constructor + */ public OtherElementComponent() { super(); } + /* + * Constructor + */ public OtherElementComponent(UriType element, UriType codeSystem, StringType code) { super(); this.element = element; @@ -858,7 +870,7 @@ public class ConceptMap extends DomainResource { } @Block() - public static class ConceptMapElementMapComponent extends BackboneElement { + public static class ConceptMapElementMapComponent extends BackboneElement implements IBaseBackboneElement { /** * An absolute URI that identifies the code system of the target code (if the target is a value set that cross code systems). */ @@ -896,10 +908,16 @@ public class ConceptMap extends DomainResource { private static final long serialVersionUID = 606421694L; + /* + * Constructor + */ public ConceptMapElementMapComponent() { super(); } + /* + * Constructor + */ public ConceptMapElementMapComponent(Enumeration equivalence) { super(); this.equivalence = equivalence; @@ -1305,10 +1323,16 @@ public class ConceptMap extends DomainResource { private static final long serialVersionUID = 729155675L; + /* + * Constructor + */ public ConceptMap() { super(); } + /* + * Constructor + */ public ConceptMap(Enumeration status, Type source, Type target) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java index f1196093fc4..36fc1c67820 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Use to record detailed information about conditions, problems or diagnoses recognized by a clinician. There are many uses including: recording a Diagnosis during an Encounter; populating a problem List or a Summary Statement, such as a Discharge Summary. @@ -175,7 +175,7 @@ public class Condition extends DomainResource { } @Block() - public static class ConditionStageComponent extends BackboneElement { + public static class ConditionStageComponent extends BackboneElement implements IBaseBackboneElement { /** * A simple summary of the stage such as "Stage 3". The determination of the stage is disease-specific. */ @@ -197,6 +197,9 @@ public class Condition extends DomainResource { private static final long serialVersionUID = -1961530405L; + /* + * Constructor + */ public ConditionStageComponent() { super(); } @@ -320,7 +323,7 @@ public class Condition extends DomainResource { } @Block() - public static class ConditionEvidenceComponent extends BackboneElement { + public static class ConditionEvidenceComponent extends BackboneElement implements IBaseBackboneElement { /** * A manifestation or symptom that led to the recording of this condition. */ @@ -342,6 +345,9 @@ public class Condition extends DomainResource { private static final long serialVersionUID = 945689926L; + /* + * Constructor + */ public ConditionEvidenceComponent() { super(); } @@ -465,7 +471,7 @@ public class Condition extends DomainResource { } @Block() - public static class ConditionLocationComponent extends BackboneElement { + public static class ConditionLocationComponent extends BackboneElement implements IBaseBackboneElement { /** * Code that identifies the structural location. */ @@ -475,6 +481,9 @@ public class Condition extends DomainResource { private static final long serialVersionUID = 1429072605L; + /* + * Constructor + */ public ConditionLocationComponent() { super(); } @@ -555,7 +564,7 @@ public class Condition extends DomainResource { } @Block() - public static class ConditionDueToComponent extends BackboneElement { + public static class ConditionDueToComponent extends BackboneElement implements IBaseBackboneElement { /** * Code that identifies the target of this relationship. The code takes the place of a detailed instance target. */ @@ -577,6 +586,9 @@ public class Condition extends DomainResource { private static final long serialVersionUID = -660755940L; + /* + * Constructor + */ public ConditionDueToComponent() { super(); } @@ -686,7 +698,7 @@ public class Condition extends DomainResource { } @Block() - public static class ConditionOccurredFollowingComponent extends BackboneElement { + public static class ConditionOccurredFollowingComponent extends BackboneElement implements IBaseBackboneElement { /** * Code that identifies the target of this relationship. The code takes the place of a detailed instance target. */ @@ -708,6 +720,9 @@ public class Condition extends DomainResource { private static final long serialVersionUID = -660755940L; + /* + * Constructor + */ public ConditionOccurredFollowingComponent() { super(); } @@ -952,10 +967,16 @@ public class Condition extends DomainResource { private static final long serialVersionUID = -1018838673L; + /* + * Constructor + */ public Condition() { super(); } + /* + * Constructor + */ public Condition(Reference patient, CodeableConcept code, Enumeration clinicalStatus) { super(); this.patient = patient; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java index 18d56c674ad..b8f7b686a43 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A conformance statement is a set of requirements for a desired implementation or a description of how a target application fulfills those requirements in a particular implementation. @@ -848,7 +848,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceContactComponent extends BackboneElement { + public static class ConformanceContactComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of an individual to contact regarding the conformance. */ @@ -865,6 +865,9 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = -1179697803L; + /* + * Constructor + */ public ConformanceContactComponent() { super(); } @@ -1004,7 +1007,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceSoftwareComponent extends BackboneElement { + public static class ConformanceSoftwareComponent extends BackboneElement implements IBaseBackboneElement { /** * Name software is known by. */ @@ -1028,10 +1031,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = 1819769027L; + /* + * Constructor + */ public ConformanceSoftwareComponent() { super(); } + /* + * Constructor + */ public ConformanceSoftwareComponent(StringType name) { super(); this.name = name; @@ -1226,7 +1235,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceImplementationComponent extends BackboneElement { + public static class ConformanceImplementationComponent extends BackboneElement implements IBaseBackboneElement { /** * Information about the specific installation that this conformance statement relates to. */ @@ -1243,10 +1252,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = -289238508L; + /* + * Constructor + */ public ConformanceImplementationComponent() { super(); } + /* + * Constructor + */ public ConformanceImplementationComponent(StringType description) { super(); this.description = description; @@ -1388,7 +1403,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceRestComponent extends BackboneElement { + public static class ConformanceRestComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies whether this portion of the statement is describing ability to initiate or receive restful operations. */ @@ -1447,10 +1462,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = -535980615L; + /* + * Constructor + */ public ConformanceRestComponent() { super(); } + /* + * Constructor + */ public ConformanceRestComponent(Enumeration mode) { super(); this.mode = mode; @@ -1882,7 +1903,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceRestSecurityComponent extends BackboneElement { + public static class ConformanceRestSecurityComponent extends BackboneElement implements IBaseBackboneElement { /** * Server adds CORS headers when responding to requests - this enables javascript applications to use the server. */ @@ -1913,6 +1934,9 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = 391663952L; + /* + * Constructor + */ public ConformanceRestSecurityComponent() { super(); } @@ -2147,7 +2171,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceRestSecurityCertificateComponent extends BackboneElement { + public static class ConformanceRestSecurityCertificateComponent extends BackboneElement implements IBaseBackboneElement { /** * Mime type for certificate. */ @@ -2164,6 +2188,9 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = 2092655854L; + /* + * Constructor + */ public ConformanceRestSecurityCertificateComponent() { super(); } @@ -2308,7 +2335,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceRestResourceComponent extends BackboneElement { + public static class ConformanceRestResourceComponent extends BackboneElement implements IBaseBackboneElement { /** * A type of resource exposed via the restful interface. */ @@ -2393,10 +2420,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = 1477462605L; + /* + * Constructor + */ public ConformanceRestResourceComponent() { super(); } + /* + * Constructor + */ public ConformanceRestResourceComponent(CodeType type) { super(); this.type = type; @@ -2983,7 +3016,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ResourceInteractionComponent extends BackboneElement { + public static class ResourceInteractionComponent extends BackboneElement implements IBaseBackboneElement { /** * Coded identifier of the operation, supported by the system resource. */ @@ -3000,10 +3033,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = -437507806L; + /* + * Constructor + */ public ResourceInteractionComponent() { super(); } + /* + * Constructor + */ public ResourceInteractionComponent(Enumeration code) { super(); this.code = code; @@ -3145,7 +3184,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceRestResourceSearchParamComponent extends BackboneElement { + public static class ConformanceRestResourceSearchParamComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of the search parameter used in the interface. */ @@ -3190,10 +3229,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = 938312816L; + /* + * Constructor + */ public ConformanceRestResourceSearchParamComponent() { super(); } + /* + * Constructor + */ public ConformanceRestResourceSearchParamComponent(StringType name, Enumeration type) { super(); this.name = name; @@ -3559,7 +3604,7 @@ public class Conformance extends DomainResource { } @Block() - public static class SystemInteractionComponent extends BackboneElement { + public static class SystemInteractionComponent extends BackboneElement implements IBaseBackboneElement { /** * A coded identifier of the operation, supported by the system. */ @@ -3576,10 +3621,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = 510675287L; + /* + * Constructor + */ public SystemInteractionComponent() { super(); } + /* + * Constructor + */ public SystemInteractionComponent(Enumeration code) { super(); this.code = code; @@ -3721,7 +3772,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceRestOperationComponent extends BackboneElement { + public static class ConformanceRestOperationComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of a query, which is used in the _query parameter when the query is called. */ @@ -3743,10 +3794,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = 122107272L; + /* + * Constructor + */ public ConformanceRestOperationComponent() { super(); } + /* + * Constructor + */ public ConformanceRestOperationComponent(StringType name, Reference definition) { super(); this.name = name; @@ -3884,7 +3941,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceMessagingComponent extends BackboneElement { + public static class ConformanceMessagingComponent extends BackboneElement implements IBaseBackboneElement { /** * An address to which messages and/or replies are to be sent. */ @@ -3915,6 +3972,9 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = -1356115534L; + /* + * Constructor + */ public ConformanceMessagingComponent() { super(); } @@ -4155,7 +4215,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceMessagingEventComponent extends BackboneElement { + public static class ConformanceMessagingEventComponent extends BackboneElement implements IBaseBackboneElement { /** * A coded identifier of a supported messaging event. */ @@ -4224,10 +4284,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = 1680159501L; + /* + * Constructor + */ public ConformanceMessagingEventComponent() { super(); } + /* + * Constructor + */ public ConformanceMessagingEventComponent(Coding code, Enumeration mode, CodeType focus, Reference request, Reference response) { super(); this.code = code; @@ -4641,7 +4707,7 @@ public class Conformance extends DomainResource { } @Block() - public static class ConformanceDocumentComponent extends BackboneElement { + public static class ConformanceDocumentComponent extends BackboneElement implements IBaseBackboneElement { /** * Mode of this document declaration - whether application is producer or consumer. */ @@ -4670,10 +4736,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = -1059555053L; + /* + * Constructor + */ public ConformanceDocumentComponent() { super(); } + /* + * Constructor + */ public ConformanceDocumentComponent(Enumeration mode, Reference profile) { super(); this.mode = mode; @@ -5009,10 +5081,16 @@ public class Conformance extends DomainResource { private static final long serialVersionUID = 1631871430L; + /* + * Constructor + */ public Conformance() { super(); } + /* + * Constructor + */ public Conformance(DateTimeType date, IdType fhirVersion, BooleanType acceptUnknown) { super(); this.date = date; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java index b7a33a9301a..d58983da7d8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Constants.java @@ -29,12 +29,12 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 public class Constants { public final static String VERSION = "0.5.0"; public final static String REVISION = "5239"; - public final static String DATE = "Tue May 05 10:00:24 EDT 2015"; + public final static String DATE = "Tue May 05 16:13:57 EDT 2015"; } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java index db423da2930..cff3e2d95b7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Details for All kinds of technology mediated contact points for a person or organization, including telephone, email, etc. @@ -288,6 +289,9 @@ public class ContactPoint extends Type implements ICompositeType { private static final long serialVersionUID = 1972725348L; + /* + * Constructor + */ public ContactPoint() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java index c4349c23d06..11c06df08f0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import java.math.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A formal agreement between parties regarding the conduct of business, exchange of information or other matters. @@ -48,7 +48,7 @@ import org.hl7.fhir.instance.model.api.*; public class Contract extends DomainResource { @Block() - public static class ActorComponent extends BackboneElement { + public static class ActorComponent extends BackboneElement implements IBaseBackboneElement { /** * Who or what actors are assigned roles in this Contract. */ @@ -70,10 +70,16 @@ public class Contract extends DomainResource { private static final long serialVersionUID = 1371245689L; + /* + * Constructor + */ public ActorComponent() { super(); } + /* + * Constructor + */ public ActorComponent(Reference entity) { super(); this.entity = entity; @@ -204,7 +210,7 @@ public class Contract extends DomainResource { } @Block() - public static class ValuedItemComponent extends BackboneElement { + public static class ValuedItemComponent extends BackboneElement implements IBaseBackboneElement { /** * Specific type of Contract Valued Item that may be priced. */ @@ -263,6 +269,9 @@ public class Contract extends DomainResource { private static final long serialVersionUID = 1311183770L; + /* + * Constructor + */ public ValuedItemComponent() { super(); } @@ -606,7 +615,7 @@ public class Contract extends DomainResource { } @Block() - public static class SignatoryComponent extends BackboneElement { + public static class SignatoryComponent extends BackboneElement implements IBaseBackboneElement { /** * Role of this Contract signer, e.g., notary, grantee. */ @@ -635,10 +644,16 @@ public class Contract extends DomainResource { private static final long serialVersionUID = -1870392043L; + /* + * Constructor + */ public SignatoryComponent() { super(); } + /* + * Constructor + */ public SignatoryComponent(Coding type, Reference party, StringType signature) { super(); this.type = type; @@ -799,7 +814,7 @@ public class Contract extends DomainResource { } @Block() - public static class TermComponent extends BackboneElement { + public static class TermComponent extends BackboneElement implements IBaseBackboneElement { /** * Unique identifier for this particular Contract Provision. */ @@ -891,6 +906,9 @@ public class Contract extends DomainResource { private static final long serialVersionUID = -1137577465L; + /* + * Constructor + */ public TermComponent() { super(); } @@ -1417,7 +1435,7 @@ public class Contract extends DomainResource { } @Block() - public static class TermActorComponent extends BackboneElement { + public static class TermActorComponent extends BackboneElement implements IBaseBackboneElement { /** * The actor assigned a role in this Contract Provision. */ @@ -1439,10 +1457,16 @@ public class Contract extends DomainResource { private static final long serialVersionUID = 1371245689L; + /* + * Constructor + */ public TermActorComponent() { super(); } + /* + * Constructor + */ public TermActorComponent(Reference entity) { super(); this.entity = entity; @@ -1573,7 +1597,7 @@ public class Contract extends DomainResource { } @Block() - public static class TermValuedItemComponent extends BackboneElement { + public static class TermValuedItemComponent extends BackboneElement implements IBaseBackboneElement { /** * Specific type of Contract Provision Valued Item that may be priced. */ @@ -1632,6 +1656,9 @@ public class Contract extends DomainResource { private static final long serialVersionUID = 1311183770L; + /* + * Constructor + */ public TermValuedItemComponent() { super(); } @@ -1975,7 +2002,7 @@ public class Contract extends DomainResource { } @Block() - public static class FriendlyLanguageComponent extends BackboneElement { + public static class FriendlyLanguageComponent extends BackboneElement implements IBaseBackboneElement { /** * Human readable rendering of this Contract in a format and representation intended to enhance comprehension and ensure understandability. */ @@ -1985,10 +2012,16 @@ public class Contract extends DomainResource { private static final long serialVersionUID = -1763459053L; + /* + * Constructor + */ public FriendlyLanguageComponent() { super(); } + /* + * Constructor + */ public FriendlyLanguageComponent(Type content) { super(); this.content = content; @@ -2070,7 +2103,7 @@ public class Contract extends DomainResource { } @Block() - public static class LegalLanguageComponent extends BackboneElement { + public static class LegalLanguageComponent extends BackboneElement implements IBaseBackboneElement { /** * Contract legal text in human renderable form. */ @@ -2080,10 +2113,16 @@ public class Contract extends DomainResource { private static final long serialVersionUID = -1763459053L; + /* + * Constructor + */ public LegalLanguageComponent() { super(); } + /* + * Constructor + */ public LegalLanguageComponent(Type content) { super(); this.content = content; @@ -2165,7 +2204,7 @@ public class Contract extends DomainResource { } @Block() - public static class ComputableLanguageComponent extends BackboneElement { + public static class ComputableLanguageComponent extends BackboneElement implements IBaseBackboneElement { /** * Computable Contract conveyed using a policy rule language (e.g. XACML, DKAL, SecPal). */ @@ -2175,10 +2214,16 @@ public class Contract extends DomainResource { private static final long serialVersionUID = -1763459053L; + /* + * Constructor + */ public ComputableLanguageComponent() { super(); } + /* + * Constructor + */ public ComputableLanguageComponent(Type content) { super(); this.content = content; @@ -2402,6 +2447,9 @@ public class Contract extends DomainResource { private static final long serialVersionUID = -1785608373L; + /* + * Constructor + */ public Contract() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java index c97b498766c..7b206f3ee70 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contraindication.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Indicates an actual or potential clinical issue with or between one or more active or proposed clinical actions for a patient. E.g. Drug-drug interaction, Ineffective treatment frequency, Procedure-condition conflict, etc. @@ -47,7 +47,7 @@ import org.hl7.fhir.instance.model.api.*; public class Contraindication extends DomainResource { @Block() - public static class ContraindicationMitigationComponent extends BackboneElement { + public static class ContraindicationMitigationComponent extends BackboneElement implements IBaseBackboneElement { /** * Describes the action that was taken or the observation that was made that reduces/eliminates the risk associated with the identified contraindication. */ @@ -76,10 +76,16 @@ public class Contraindication extends DomainResource { private static final long serialVersionUID = -1994768436L; + /* + * Constructor + */ public ContraindicationMitigationComponent() { super(); } + /* + * Constructor + */ public ContraindicationMitigationComponent(CodeableConcept action) { super(); this.action = action; @@ -333,6 +339,9 @@ public class Contraindication extends DomainResource { private static final long serialVersionUID = 528603336L; + /* + * Constructor + */ public Contraindication() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java index 5ba05fbefee..81dde36b108 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Count.java @@ -29,9 +29,10 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java index 62ce92b5052..dd10d847882 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Financial instrument which may be used to pay for or reimburse for health care products and services. @@ -161,6 +161,9 @@ public class Coverage extends DomainResource { private static final long serialVersionUID = -1312031251L; + /* + * Constructor + */ public Coverage() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java index fe8d7c03d14..b6a37f88183 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * The formal description of a single piece of information that can be gathered and reported. @@ -176,7 +176,7 @@ public class DataElement extends DomainResource { } @Block() - public static class DataElementContactComponent extends BackboneElement { + public static class DataElementContactComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of an individual to contact regarding the data element. */ @@ -193,6 +193,9 @@ public class DataElement extends DomainResource { private static final long serialVersionUID = -1179697803L; + /* + * Constructor + */ public DataElementContactComponent() { super(); } @@ -332,7 +335,7 @@ public class DataElement extends DomainResource { } @Block() - public static class DataElementMappingComponent extends BackboneElement { + public static class DataElementMappingComponent extends BackboneElement implements IBaseBackboneElement { /** * An Internal id that is used to identify this mapping set when specific mappings are made on a per-element basis. */ @@ -363,10 +366,16 @@ public class DataElement extends DomainResource { private static final long serialVersionUID = 299630820L; + /* + * Constructor + */ public DataElementMappingComponent() { super(); } + /* + * Constructor + */ public DataElementMappingComponent(IdType identity) { super(); this.identity = identity; @@ -711,10 +720,16 @@ public class DataElement extends DomainResource { private static final long serialVersionUID = -1444116299L; + /* + * Constructor + */ public DataElement() { super(); } + /* + * Constructor + */ public DataElement(Enumeration status) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java index d58065c346e..d681e70b401 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource identifies an instance of a manufactured thing that is used in the provision of healthcare without being substantially changed through that activity. The device may be a machine, an insert, a computer, an application, etc. This includes durable (reusable) medical equipment as well as disposable equipment used for diagnostic, treatment, and research for healthcare and public health. @@ -254,10 +254,16 @@ public class Device extends DomainResource { private static final long serialVersionUID = -699591241L; + /* + * Constructor + */ public Device() { super(); } + /* + * Constructor + */ public Device(CodeableConcept type) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java index d9c8a57560d..7f75b29c377 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Describes the characteristics, operational status and capabilities of a medical-related component of a medical device. @@ -245,7 +245,7 @@ public class DeviceComponent extends DomainResource { } @Block() - public static class DeviceComponentProductionSpecificationComponent extends BackboneElement { + public static class DeviceComponentProductionSpecificationComponent extends BackboneElement implements IBaseBackboneElement { /** * Describes the specification type, such as, serial number, part number, hardware revision, software revision, etc. */ @@ -269,6 +269,9 @@ public class DeviceComponent extends DomainResource { private static final long serialVersionUID = -1476597516L; + /* + * Constructor + */ public DeviceComponentProductionSpecificationComponent() { super(); } @@ -496,10 +499,16 @@ public class DeviceComponent extends DomainResource { private static final long serialVersionUID = 1179239259L; + /* + * Constructor + */ public DeviceComponent() { super(); } + /* + * Constructor + */ public DeviceComponent(CodeableConcept type, Identifier identifier, InstantType lastSystemChange) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java index 892d7f3d067..aa343809f9d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceMetric.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Describes a measurement, calculation or setting capability of a medical device. @@ -589,7 +589,7 @@ public class DeviceMetric extends DomainResource { } @Block() - public static class DeviceMetricCalibrationComponent extends BackboneElement { + public static class DeviceMetricCalibrationComponent extends BackboneElement implements IBaseBackboneElement { /** * Describes the type of the calibration method. */ @@ -613,6 +613,9 @@ public class DeviceMetric extends DomainResource { private static final long serialVersionUID = 407720126L; + /* + * Constructor + */ public DeviceMetricCalibrationComponent() { super(); } @@ -896,10 +899,16 @@ period. private static final long serialVersionUID = -480554704L; + /* + * Constructor + */ public DeviceMetric() { super(); } + /* + * Constructor + */ public DeviceMetric(CodeableConcept type, Identifier identifier, Enumeration category) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java index b23088e3330..e55088e6621 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseRequest.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Represents a request for a patient to employ a medical device. The device may be an implantable device, or an external assistive device, such as a walker. @@ -438,10 +438,16 @@ public class DeviceUseRequest extends DomainResource { private static final long serialVersionUID = 1208477058L; + /* + * Constructor + */ public DeviceUseRequest() { super(); } + /* + * Constructor + */ public DeviceUseRequest(Reference device, Reference subject) { super(); this.device = device; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java index de0b44a28d4..6e85a289725 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceUseStatement.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A record of a device being used by a patient where the record is the result of a report from the patient or another clinician. @@ -121,10 +121,16 @@ public class DeviceUseStatement extends DomainResource { private static final long serialVersionUID = -1668571635L; + /* + * Constructor + */ public DeviceUseStatement() { super(); } + /* + * Constructor + */ public DeviceUseStatement(Reference device, Reference subject) { super(); this.device = device; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java index 81de5b78879..b501d08b8cf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticOrder.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A record of a request for a diagnostic investigation service to be performed. @@ -373,7 +373,7 @@ public class DiagnosticOrder extends DomainResource { } @Block() - public static class DiagnosticOrderEventComponent extends BackboneElement { + public static class DiagnosticOrderEventComponent extends BackboneElement implements IBaseBackboneElement { /** * The status for the event. */ @@ -409,10 +409,16 @@ public class DiagnosticOrder extends DomainResource { private static final long serialVersionUID = -370793723L; + /* + * Constructor + */ public DiagnosticOrderEventComponent() { super(); } + /* + * Constructor + */ public DiagnosticOrderEventComponent(Enumeration status, DateTimeType dateTime) { super(); this.status = status; @@ -619,7 +625,7 @@ public class DiagnosticOrder extends DomainResource { } @Block() - public static class DiagnosticOrderItemComponent extends BackboneElement { + public static class DiagnosticOrderItemComponent extends BackboneElement implements IBaseBackboneElement { /** * A code that identifies a particular diagnostic investigation, or panel of investigations, that have been requested. */ @@ -662,10 +668,16 @@ public class DiagnosticOrder extends DomainResource { private static final long serialVersionUID = 1960490281L; + /* + * Constructor + */ public DiagnosticOrderItemComponent() { super(); } + /* + * Constructor + */ public DiagnosticOrderItemComponent(CodeableConcept code) { super(); this.code = code; @@ -1043,10 +1055,16 @@ public class DiagnosticOrder extends DomainResource { private static final long serialVersionUID = 1028294242L; + /* + * Constructor + */ public DiagnosticOrder() { super(); } + /* + * Constructor + */ public DiagnosticOrder(Reference subject) { super(); this.subject = subject; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java index 52c624b2e56..b5d9ae7f387 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * The findings and interpretation of diagnostic tests performed on patients, groups of patients, devices, and locations, and/or specimens derived from these. The report includes clinical context such as requesting and provider information, and some mix of atomic results, images, textual and coded interpretation, and formatted representation of diagnostic reports. @@ -189,7 +189,7 @@ public class DiagnosticReport extends DomainResource { } @Block() - public static class DiagnosticReportImageComponent extends BackboneElement { + public static class DiagnosticReportImageComponent extends BackboneElement implements IBaseBackboneElement { /** * A comment about the image. Typically, this is used to provide an explanation for why the image is included, or to draw the viewer's attention to important features. */ @@ -211,10 +211,16 @@ public class DiagnosticReport extends DomainResource { private static final long serialVersionUID = 935791940L; + /* + * Constructor + */ public DiagnosticReportImageComponent() { super(); } + /* + * Constructor + */ public DiagnosticReportImageComponent(Reference link) { super(); this.link = link; @@ -510,10 +516,16 @@ public class DiagnosticReport extends DomainResource { private static final long serialVersionUID = 140402748L; + /* + * Constructor + */ public DiagnosticReport() { super(); } + /* + * Constructor + */ public DiagnosticReport(CodeableConcept name, Enumeration status, DateTimeType issued, Reference subject, Reference performer, Type diagnostic) { super(); this.name = name; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java index 8055b72fc54..75b6dc9cebc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Distance.java @@ -29,9 +29,10 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java index 0cec35e26c7..148c921e81f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A manifest that defines a set of documents. @@ -133,7 +133,7 @@ public class DocumentManifest extends DomainResource { } @Block() - public static class DocumentManifestContentComponent extends BackboneElement { + public static class DocumentManifestContentComponent extends BackboneElement implements IBaseBackboneElement { /** * The list of DocumentReference or Media Resources, or Attachment that consist of the parts of this document manifest. Usually, these would be document references, but direct references to Media or Attachments are also allowed. */ @@ -143,10 +143,16 @@ public class DocumentManifest extends DomainResource { private static final long serialVersionUID = -347538500L; + /* + * Constructor + */ public DocumentManifestContentComponent() { super(); } + /* + * Constructor + */ public DocumentManifestContentComponent(Type p) { super(); this.p = p; @@ -228,7 +234,7 @@ public class DocumentManifest extends DomainResource { } @Block() - public static class DocumentManifestRelatedComponent extends BackboneElement { + public static class DocumentManifestRelatedComponent extends BackboneElement implements IBaseBackboneElement { /** * Related identifier to this DocumentManifest. If both id and ref are present they shall refer to the same thing. */ @@ -250,6 +256,9 @@ public class DocumentManifest extends DomainResource { private static final long serialVersionUID = -1670123330L; + /* + * Constructor + */ public DocumentManifestRelatedComponent() { super(); } @@ -459,10 +468,16 @@ public class DocumentManifest extends DomainResource { private static final long serialVersionUID = -2056683927L; + /* + * Constructor + */ public DocumentManifest() { super(); } + /* + * Constructor + */ public DocumentManifest(Enumeration status) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java index 3e04a36d332..19a33af48d4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A reference to a document. @@ -233,7 +233,7 @@ public class DocumentReference extends DomainResource { } @Block() - public static class DocumentReferenceRelatesToComponent extends BackboneElement { + public static class DocumentReferenceRelatesToComponent extends BackboneElement implements IBaseBackboneElement { /** * The type of relationship that this document has with anther document. */ @@ -255,10 +255,16 @@ public class DocumentReference extends DomainResource { private static final long serialVersionUID = -347257495L; + /* + * Constructor + */ public DocumentReferenceRelatesToComponent() { super(); } + /* + * Constructor + */ public DocumentReferenceRelatesToComponent(Enumeration code, Reference target) { super(); this.code = code; @@ -396,7 +402,7 @@ public class DocumentReference extends DomainResource { } @Block() - public static class DocumentReferenceContextComponent extends BackboneElement { + public static class DocumentReferenceContextComponent extends BackboneElement implements IBaseBackboneElement { /** * This list of codes represents the main clinical acts, such as a colonoscopy or an appendectomy, being documented. In some cases, the event is inherent in the typeCode, such as a "History and Physical Report" in which the procedure being documented is necessarily a "History and Physical" act. */ @@ -446,6 +452,9 @@ public class DocumentReference extends DomainResource { private static final long serialVersionUID = -225578230L; + /* + * Constructor + */ public DocumentReferenceContextComponent() { super(); } @@ -708,7 +717,7 @@ public class DocumentReference extends DomainResource { } @Block() - public static class DocumentReferenceContextRelatedComponent extends BackboneElement { + public static class DocumentReferenceContextRelatedComponent extends BackboneElement implements IBaseBackboneElement { /** * Related identifier to this DocumentReference. If both id and ref are present they shall refer to the same thing. */ @@ -730,6 +739,9 @@ public class DocumentReference extends DomainResource { private static final long serialVersionUID = -1670123330L; + /* + * Constructor + */ public DocumentReferenceContextRelatedComponent() { super(); } @@ -986,10 +998,16 @@ public class DocumentReference extends DomainResource { private static final long serialVersionUID = 1440270142L; + /* + * Constructor + */ public DocumentReference() { super(); } + /* + * Constructor + */ public DocumentReference(CodeableConcept type, InstantType indexed, Enumeration status) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java index a8e8248ef03..4fb9037d873 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DomainResource.java @@ -29,21 +29,20 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A resource that includes narrative, extensions, and contained resources. */ -@ResourceDef(name="DomainResource", profile="http://hl7.org/fhir/Profile/DomainResource") -public abstract class DomainResource extends Resource { +public abstract class DomainResource extends Resource implements IBaseHasExtensions, IBaseHasModifierExtensions, IDomainResource { /** * A human-readable narrative that contains a summary of the resource, and may be used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is required to contain sufficient detail to make it "clinically safe" for a human to just read the narrative. Resource definitions may define what content should be represented in the narrative to ensure clinical safety. @@ -75,6 +74,9 @@ public abstract class DomainResource extends Resource { private static final long serialVersionUID = -970285559L; + /* + * Constructor + */ public DomainResource() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java index f462a80bad3..01dd8cdf969 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Duration.java @@ -29,9 +29,10 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java index e4a15d74174..e4c8d2eae6f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Base definition for all elements in a resource. @@ -59,6 +60,9 @@ public abstract class Element extends Base implements IBaseHasExtensions { private static final long serialVersionUID = -158027598L; + /* + * Constructor + */ public Element() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java index 5e4f2cc8f27..4416d305bc2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Captures constraints on each element within the resource, profile, or extension. @@ -446,7 +447,8 @@ public class ElementDefinition extends Type implements ICompositeType { } } - public static class ElementDefinitionSlicingComponent extends Element { + @Block() + public static class ElementDefinitionSlicingComponent extends Element implements IBaseDatatypeElement { /** * Designates which child elements are used to discriminate between the slices when processing an instance. If one or more discriminators are provided, the value of the child elements in the instance data SHALL completely distinguish which slice the element in the resource matches based on the allowed values for those elements in each of the slices. */ @@ -477,10 +479,16 @@ public class ElementDefinition extends Type implements ICompositeType { private static final long serialVersionUID = -321298491L; + /* + * Constructor + */ public ElementDefinitionSlicingComponent() { super(); } + /* + * Constructor + */ public ElementDefinitionSlicingComponent(Enumeration rules) { super(); this.rules = rules; @@ -730,7 +738,8 @@ public class ElementDefinition extends Type implements ICompositeType { } - public static class TypeRefComponent extends Element { + @Block() + public static class TypeRefComponent extends Element implements IBaseDatatypeElement { /** * Name of Data type or Resource that is a(or the) type used for this element. */ @@ -754,10 +763,16 @@ public class ElementDefinition extends Type implements ICompositeType { private static final long serialVersionUID = -1527133887L; + /* + * Constructor + */ public TypeRefComponent() { super(); } + /* + * Constructor + */ public TypeRefComponent(CodeType code) { super(); this.code = code; @@ -960,7 +975,8 @@ public class ElementDefinition extends Type implements ICompositeType { } - public static class ElementDefinitionConstraintComponent extends Element { + @Block() + public static class ElementDefinitionConstraintComponent extends Element implements IBaseDatatypeElement { /** * Allows identification of which elements have their cardinalities impacted by the constraint. Will not be referenced for constraints that do not affect cardinality. */ @@ -998,10 +1014,16 @@ public class ElementDefinition extends Type implements ICompositeType { private static final long serialVersionUID = -1195616532L; + /* + * Constructor + */ public ElementDefinitionConstraintComponent() { super(); } + /* + * Constructor + */ public ElementDefinitionConstraintComponent(IdType key, Enumeration severity, StringType human, StringType xpath) { super(); this.key = key; @@ -1289,7 +1311,8 @@ public class ElementDefinition extends Type implements ICompositeType { } - public static class ElementDefinitionBindingComponent extends Element { + @Block() + public static class ElementDefinitionBindingComponent extends Element implements IBaseDatatypeElement { /** * A descriptive name for this - can be useful for generating implementation artifacts. */ @@ -1320,10 +1343,16 @@ public class ElementDefinition extends Type implements ICompositeType { private static final long serialVersionUID = 325485202L; + /* + * Constructor + */ public ElementDefinitionBindingComponent() { super(); } + /* + * Constructor + */ public ElementDefinitionBindingComponent(StringType name, Enumeration strength) { super(); this.name = name; @@ -1554,7 +1583,8 @@ public class ElementDefinition extends Type implements ICompositeType { } - public static class ElementDefinitionMappingComponent extends Element { + @Block() + public static class ElementDefinitionMappingComponent extends Element implements IBaseDatatypeElement { /** * An internal reference to the definition of a mapping. */ @@ -1578,10 +1608,16 @@ public class ElementDefinition extends Type implements ICompositeType { private static final long serialVersionUID = -669205371L; + /* + * Constructor + */ public ElementDefinitionMappingComponent() { super(); } + /* + * Constructor + */ public ElementDefinitionMappingComponent(IdType identity, StringType map) { super(); this.identity = identity; @@ -1970,10 +2006,16 @@ public class ElementDefinition extends Type implements ICompositeType { private static final long serialVersionUID = 1149674414L; + /* + * Constructor + */ public ElementDefinition() { super(); } + /* + * Constructor + */ public ElementDefinition(StringType path) { super(); this.path = path; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java index 9ea67550bc9..5dda500dafb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityRequest.java @@ -29,15 +29,15 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides the insurance eligibility details from the insurer regarding a specified coverage and optionally some class of service. @@ -111,6 +111,9 @@ public class EligibilityRequest extends DomainResource { private static final long serialVersionUID = 1836339504L; + /* + * Constructor + */ public EligibilityRequest() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java index 5536db01264..928da1af3ef 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides eligibility and plan details from the processing of an Eligibility resource. @@ -210,6 +210,9 @@ public class EligibilityResponse extends DomainResource { private static final long serialVersionUID = 241710852L; + /* + * Constructor + */ public EligibilityResponse() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java index 2de48d3991a..d1bbee08859 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Encounter.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * An interaction between a patient and healthcare provider(s) for the purpose of providing healthcare service(s) or assessing the health status of a patient. @@ -431,7 +431,7 @@ public class Encounter extends DomainResource { } @Block() - public static class EncounterStatusHistoryComponent extends BackboneElement { + public static class EncounterStatusHistoryComponent extends BackboneElement implements IBaseBackboneElement { /** * planned | arrived | in-progress | onleave | finished | cancelled. */ @@ -448,10 +448,16 @@ public class Encounter extends DomainResource { private static final long serialVersionUID = 919229161L; + /* + * Constructor + */ public EncounterStatusHistoryComponent() { super(); } + /* + * Constructor + */ public EncounterStatusHistoryComponent(Enumeration status, Period period) { super(); this.status = status; @@ -569,7 +575,7 @@ public class Encounter extends DomainResource { } @Block() - public static class EncounterParticipantComponent extends BackboneElement { + public static class EncounterParticipantComponent extends BackboneElement implements IBaseBackboneElement { /** * Role of participant in encounter. */ @@ -598,6 +604,9 @@ public class Encounter extends DomainResource { private static final long serialVersionUID = 317095765L; + /* + * Constructor + */ public EncounterParticipantComponent() { super(); } @@ -754,7 +763,7 @@ public class Encounter extends DomainResource { } @Block() - public static class EncounterHospitalizationComponent extends BackboneElement { + public static class EncounterHospitalizationComponent extends BackboneElement implements IBaseBackboneElement { /** * Pre-admission identifier. */ @@ -842,6 +851,9 @@ public class Encounter extends DomainResource { private static final long serialVersionUID = -990619663L; + /* + * Constructor + */ public EncounterHospitalizationComponent() { super(); } @@ -1269,7 +1281,7 @@ public class Encounter extends DomainResource { } @Block() - public static class EncounterLocationComponent extends BackboneElement { + public static class EncounterLocationComponent extends BackboneElement implements IBaseBackboneElement { /** * The location where the encounter takes place. */ @@ -1298,10 +1310,16 @@ public class Encounter extends DomainResource { private static final long serialVersionUID = -322984880L; + /* + * Constructor + */ public EncounterLocationComponent() { super(); } + /* + * Constructor + */ public EncounterLocationComponent(Reference location) { super(); this.location = location; @@ -1640,10 +1658,16 @@ The indication will typically be a Condition (with other resources referenced in private static final long serialVersionUID = 413573588L; + /* + * Constructor + */ public Encounter() { super(); } + /* + * Constructor + */ public Encounter(Enumeration status) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java index d62c463527b..92effb92167 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentRequest.java @@ -29,15 +29,15 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides the insurance Enrollment details to the insurer regarding a specified coverage. @@ -142,10 +142,16 @@ public class EnrollmentRequest extends DomainResource { private static final long serialVersionUID = -1656505325L; + /* + * Constructor + */ public EnrollmentRequest() { super(); } + /* + * Constructor + */ public EnrollmentRequest(Reference subject, Reference coverage, Coding relationship) { super(); this.subject = subject; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java index 22c4012b085..eaf0afb13e0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides Enrollment and plan details from the processing of an Enrollment resource. @@ -210,6 +210,9 @@ public class EnrollmentResponse extends DomainResource { private static final long serialVersionUID = -318929031L; + /* + * Constructor + */ public EnrollmentResponse() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java index a212d0f6462..c6a883e1e4c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EpisodeOfCare.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * An association between a patient and an organization / healthcare provider(s) during which time encounters may occur. The managing organization assumes a level of responsibility for the patient during this time. @@ -175,7 +175,7 @@ public class EpisodeOfCare extends DomainResource { } @Block() - public static class EpisodeOfCareStatusHistoryComponent extends BackboneElement { + public static class EpisodeOfCareStatusHistoryComponent extends BackboneElement implements IBaseBackboneElement { /** * planned | waitlist | active | onhold | finished | cancelled. */ @@ -192,10 +192,16 @@ public class EpisodeOfCare extends DomainResource { private static final long serialVersionUID = -1192432864L; + /* + * Constructor + */ public EpisodeOfCareStatusHistoryComponent() { super(); } + /* + * Constructor + */ public EpisodeOfCareStatusHistoryComponent(Enumeration status, Period period) { super(); this.status = status; @@ -313,7 +319,7 @@ public class EpisodeOfCare extends DomainResource { } @Block() - public static class EpisodeOfCareCareTeamComponent extends BackboneElement { + public static class EpisodeOfCareCareTeamComponent extends BackboneElement implements IBaseBackboneElement { /** * The practitioner (or Organization) within the team. */ @@ -342,6 +348,9 @@ public class EpisodeOfCare extends DomainResource { private static final long serialVersionUID = -2134086895L; + /* + * Constructor + */ public EpisodeOfCareCareTeamComponent() { super(); } @@ -601,10 +610,16 @@ public class EpisodeOfCare extends DomainResource { private static final long serialVersionUID = -1251791864L; + /* + * Constructor + */ public EpisodeOfCare() { super(); } + /* + * Constructor + */ public EpisodeOfCare(Enumeration status, Reference patient) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java index 4bb6c04388e..d6d16e3e330 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides: the claim details; adjudication details from the processing of a Claim; and optionally account balance information, for informing the subscriber of the benefits provided. @@ -210,6 +210,9 @@ public class ExplanationOfBenefit extends DomainResource { private static final long serialVersionUID = 2098041034L; + /* + * Constructor + */ public ExplanationOfBenefit() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java index 30fd932eef1..41d36c1d69c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Extension.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Optional Extensions Element - found in all resources. @@ -60,10 +61,16 @@ public class Extension extends BaseExtension implements IBaseExtension status, Reference patient, CodeableConcept code) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java index 2a47804ca82..76ed5c509b7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Goal.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Describes the intended objective(s) of patient care, for example, weight loss, restoring an activity of daily living, etc. @@ -203,7 +203,7 @@ public class Goal extends DomainResource { } @Block() - public static class GoalOutcomeComponent extends BackboneElement { + public static class GoalOutcomeComponent extends BackboneElement implements IBaseBackboneElement { /** * Details of what's changed (or not changed). */ @@ -213,6 +213,9 @@ public class Goal extends DomainResource { private static final long serialVersionUID = 1994317639L; + /* + * Constructor + */ public GoalOutcomeComponent() { super(); } @@ -386,10 +389,16 @@ public class Goal extends DomainResource { private static final long serialVersionUID = -314822558L; + /* + * Constructor + */ public Goal() { super(); } + /* + * Constructor + */ public Goal(StringType description, Enumeration status) { super(); this.description = description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java index e71e83bff64..854995c5ba2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Represents a defined collection of entities that may be discussed or acted upon collectively but which are not expected to act collectively and are not formally or legally recognized. I.e. A collection of entities that isn't an Organization. @@ -175,7 +175,7 @@ public class Group extends DomainResource { } @Block() - public static class GroupCharacteristicComponent extends BackboneElement { + public static class GroupCharacteristicComponent extends BackboneElement implements IBaseBackboneElement { /** * A code that identifies the kind of trait being asserted. */ @@ -199,10 +199,16 @@ public class Group extends DomainResource { private static final long serialVersionUID = 803478031L; + /* + * Constructor + */ public GroupCharacteristicComponent() { super(); } + /* + * Constructor + */ public GroupCharacteristicComponent(CodeableConcept code, Type value, BooleanType exclude) { super(); this.code = code; @@ -441,10 +447,16 @@ public class Group extends DomainResource { private static final long serialVersionUID = -1024529199L; + /* + * Constructor + */ public Group() { super(); } + /* + * Constructor + */ public Group(Enumeration type, BooleanType actual) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java index 94b8adc44c3..81037292743 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * The details of a Healthcare Service available at a location. @@ -189,7 +189,7 @@ public class HealthcareService extends DomainResource { } @Block() - public static class ServiceTypeComponent extends BackboneElement { + public static class ServiceTypeComponent extends BackboneElement implements IBaseBackboneElement { /** * The specific type of service being delivered or performed. */ @@ -206,10 +206,16 @@ public class HealthcareService extends DomainResource { private static final long serialVersionUID = 1703986174L; + /* + * Constructor + */ public ServiceTypeComponent() { super(); } + /* + * Constructor + */ public ServiceTypeComponent(CodeableConcept type) { super(); this.type = type; @@ -325,7 +331,7 @@ public class HealthcareService extends DomainResource { } @Block() - public static class HealthcareServiceAvailableTimeComponent extends BackboneElement { + public static class HealthcareServiceAvailableTimeComponent extends BackboneElement implements IBaseBackboneElement { /** * Indicates which Days of the week are available between the Start and End Times. */ @@ -356,6 +362,9 @@ public class HealthcareService extends DomainResource { private static final long serialVersionUID = -2139510127L; + /* + * Constructor + */ public HealthcareServiceAvailableTimeComponent() { super(); } @@ -610,7 +619,7 @@ public class HealthcareService extends DomainResource { } @Block() - public static class HealthcareServiceNotAvailableComponent extends BackboneElement { + public static class HealthcareServiceNotAvailableComponent extends BackboneElement implements IBaseBackboneElement { /** * The reason that can be presented to the user as to why this time is not available. */ @@ -627,10 +636,16 @@ public class HealthcareService extends DomainResource { private static final long serialVersionUID = 310849929L; + /* + * Constructor + */ public HealthcareServiceNotAvailableComponent() { super(); } + /* + * Constructor + */ public HealthcareServiceNotAvailableComponent(StringType description) { super(); this.description = description; @@ -917,10 +932,16 @@ public class HealthcareService extends DomainResource { private static final long serialVersionUID = 543354370L; + /* + * Constructor + */ public HealthcareService() { super(); } + /* + * Constructor + */ public HealthcareService(Reference location) { super(); this.location = location; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java index 687f35383e8..a52ad22ba35 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A human's name with the ability to identify parts and usage. @@ -237,6 +238,9 @@ public class HumanName extends Type implements ICompositeType { private static final long serialVersionUID = -210174642L; + /* + * Constructor + */ public HumanName() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java index 5073d884500..746af902251 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A technical identifier - identifies some entity uniquely and unambiguously. @@ -193,6 +194,9 @@ public class Identifier extends Type implements ICompositeType { private static final long serialVersionUID = -478840981L; + /* + * Constructor + */ public Identifier() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java index 3cfbdf7c712..18348c7ab09 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A set of DICOM SOP Instances of a patient, selected for some application purpose, e.g., quality assurance, teaching, conference, consulting, etc. Objects selected can be from different studies, but must be of the same patient. @@ -47,7 +47,7 @@ import org.hl7.fhir.instance.model.api.*; public class ImagingObjectSelection extends DomainResource { @Block() - public static class StudyComponent extends BackboneElement { + public static class StudyComponent extends BackboneElement implements IBaseBackboneElement { /** * Study instance uid of the SOP instances in the selection. */ @@ -71,10 +71,16 @@ public class ImagingObjectSelection extends DomainResource { private static final long serialVersionUID = -1632673574L; + /* + * Constructor + */ public StudyComponent() { super(); } + /* + * Constructor + */ public StudyComponent(OidType uid) { super(); this.uid = uid; @@ -263,7 +269,7 @@ public class ImagingObjectSelection extends DomainResource { } @Block() - public static class SeriesComponent extends BackboneElement { + public static class SeriesComponent extends BackboneElement implements IBaseBackboneElement { /** * Series instance uid of the SOP instances in the selection. */ @@ -287,6 +293,9 @@ public class ImagingObjectSelection extends DomainResource { private static final long serialVersionUID = 229247770L; + /* + * Constructor + */ public SeriesComponent() { super(); } @@ -478,7 +487,7 @@ public class ImagingObjectSelection extends DomainResource { } @Block() - public static class InstanceComponent extends BackboneElement { + public static class InstanceComponent extends BackboneElement implements IBaseBackboneElement { /** * SOP class uid of the selected instance. */ @@ -509,10 +518,16 @@ public class ImagingObjectSelection extends DomainResource { private static final long serialVersionUID = 1641180916L; + /* + * Constructor + */ public InstanceComponent() { super(); } + /* + * Constructor + */ public InstanceComponent(OidType sopClass, OidType uid, UriType url) { super(); this.sopClass = sopClass; @@ -747,7 +762,7 @@ public class ImagingObjectSelection extends DomainResource { } @Block() - public static class FramesComponent extends BackboneElement { + public static class FramesComponent extends BackboneElement implements IBaseBackboneElement { /** * The frame numbers in the frame set. */ @@ -764,10 +779,16 @@ public class ImagingObjectSelection extends DomainResource { private static final long serialVersionUID = -2068206970L; + /* + * Constructor + */ public FramesComponent() { super(); } + /* + * Constructor + */ public FramesComponent(UriType url) { super(); this.url = url; @@ -978,10 +999,16 @@ public class ImagingObjectSelection extends DomainResource { private static final long serialVersionUID = -1961832713L; + /* + * Constructor + */ public ImagingObjectSelection() { super(); } + /* + * Constructor + */ public ImagingObjectSelection(OidType uid, Reference patient, CodeableConcept title) { super(); this.uid = uid; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java index 20c99c10432..40af6ad0e6f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Representation of the content produced in a DICOM imaging study. A study comprises a set of Series, each of which includes a set of Service-Object Pair Instances (SOP Instances - images or other data) acquired or produced in a common context. A Series is of only one modality (e.g., X-ray, CT, MR, ultrasound), but a Study may have multiple Series of different modalities. @@ -1481,7 +1481,7 @@ public class ImagingStudy extends DomainResource { } @Block() - public static class ImagingStudySeriesComponent extends BackboneElement { + public static class ImagingStudySeriesComponent extends BackboneElement implements IBaseBackboneElement { /** * The Numeric identifier of this series in the study. */ @@ -1561,10 +1561,16 @@ public class ImagingStudy extends DomainResource { private static final long serialVersionUID = 1186612269L; + /* + * Constructor + */ public ImagingStudySeriesComponent() { super(); } + /* + * Constructor + */ public ImagingStudySeriesComponent(Enumeration modality, OidType uid, UnsignedIntType numberOfInstances) { super(); this.modality = modality; @@ -2110,7 +2116,7 @@ public class ImagingStudy extends DomainResource { } @Block() - public static class ImagingStudySeriesInstanceComponent extends BackboneElement { + public static class ImagingStudySeriesInstanceComponent extends BackboneElement implements IBaseBackboneElement { /** * The number of this image in the series. */ @@ -2155,10 +2161,16 @@ public class ImagingStudy extends DomainResource { private static final long serialVersionUID = 264997991L; + /* + * Constructor + */ public ImagingStudySeriesInstanceComponent() { super(); } + /* + * Constructor + */ public ImagingStudySeriesInstanceComponent(OidType uid, OidType sopclass) { super(); this.uid = uid; @@ -2636,10 +2648,16 @@ public class ImagingStudy extends DomainResource { private static final long serialVersionUID = 206272292L; + /* + * Constructor + */ public ImagingStudy() { super(); } + /* + * Constructor + */ public ImagingStudy(Reference patient, OidType uid, UnsignedIntType numberOfSeries, UnsignedIntType numberOfInstances) { super(); this.patient = patient; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java index edee4471f11..94bb8f37781 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Immunization event information. @@ -47,7 +47,7 @@ import org.hl7.fhir.instance.model.api.*; public class Immunization extends DomainResource { @Block() - public static class ImmunizationExplanationComponent extends BackboneElement { + public static class ImmunizationExplanationComponent extends BackboneElement implements IBaseBackboneElement { /** * Reasons why a vaccine was administered. */ @@ -64,6 +64,9 @@ public class Immunization extends DomainResource { private static final long serialVersionUID = -539821866L; + /* + * Constructor + */ public ImmunizationExplanationComponent() { super(); } @@ -199,7 +202,7 @@ public class Immunization extends DomainResource { } @Block() - public static class ImmunizationReactionComponent extends BackboneElement { + public static class ImmunizationReactionComponent extends BackboneElement implements IBaseBackboneElement { /** * Date of reaction to the immunization. */ @@ -228,6 +231,9 @@ public class Immunization extends DomainResource { private static final long serialVersionUID = -1297668556L; + /* + * Constructor + */ public ImmunizationReactionComponent() { super(); } @@ -415,7 +421,7 @@ public class Immunization extends DomainResource { } @Block() - public static class ImmunizationVaccinationProtocolComponent extends BackboneElement { + public static class ImmunizationVaccinationProtocolComponent extends BackboneElement implements IBaseBackboneElement { /** * Nominal position in a series. */ @@ -479,10 +485,16 @@ public class Immunization extends DomainResource { private static final long serialVersionUID = -783437472L; + /* + * Constructor + */ public ImmunizationVaccinationProtocolComponent() { super(); } + /* + * Constructor + */ public ImmunizationVaccinationProtocolComponent(PositiveIntType doseSequence, CodeableConcept doseTarget, CodeableConcept doseStatus) { super(); this.doseSequence = doseSequence; @@ -1018,10 +1030,16 @@ public class Immunization extends DomainResource { private static final long serialVersionUID = -1610924217L; + /* + * Constructor + */ public Immunization() { super(); } + /* + * Constructor + */ public Immunization(DateTimeType date, CodeableConcept vaccineType, Reference patient, BooleanType wasNotGiven, BooleanType reported) { super(); this.date = date; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java index 64de6c822cb..e2fe849ba73 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A patient's point-of-time immunization status and recommendation with optional supporting justification. @@ -47,7 +47,7 @@ import org.hl7.fhir.instance.model.api.*; public class ImmunizationRecommendation extends DomainResource { @Block() - public static class ImmunizationRecommendationRecommendationComponent extends BackboneElement { + public static class ImmunizationRecommendationRecommendationComponent extends BackboneElement implements IBaseBackboneElement { /** * The date the immunization recommendation was created. */ @@ -116,10 +116,16 @@ public class ImmunizationRecommendation extends DomainResource { private static final long serialVersionUID = 366360557L; + /* + * Constructor + */ public ImmunizationRecommendationRecommendationComponent() { super(); } + /* + * Constructor + */ public ImmunizationRecommendationRecommendationComponent(DateTimeType date, CodeableConcept vaccineType, CodeableConcept forecastStatus) { super(); this.date = date; @@ -511,7 +517,7 @@ public class ImmunizationRecommendation extends DomainResource { } @Block() - public static class ImmunizationRecommendationRecommendationDateCriterionComponent extends BackboneElement { + public static class ImmunizationRecommendationRecommendationDateCriterionComponent extends BackboneElement implements IBaseBackboneElement { /** * Date classification of recommendation - e.g. earliest date to give, latest date to give, etc. */ @@ -528,10 +534,16 @@ public class ImmunizationRecommendation extends DomainResource { private static final long serialVersionUID = 1036994566L; + /* + * Constructor + */ public ImmunizationRecommendationRecommendationDateCriterionComponent() { super(); } + /* + * Constructor + */ public ImmunizationRecommendationRecommendationDateCriterionComponent(CodeableConcept code, DateTimeType value) { super(); this.code = code; @@ -649,7 +661,7 @@ public class ImmunizationRecommendation extends DomainResource { } @Block() - public static class ImmunizationRecommendationRecommendationProtocolComponent extends BackboneElement { + public static class ImmunizationRecommendationRecommendationProtocolComponent extends BackboneElement implements IBaseBackboneElement { /** * Indicates the nominal position in a series of the next dose. This is the recommended dose number as per a specified protocol. */ @@ -685,6 +697,9 @@ public class ImmunizationRecommendation extends DomainResource { private static final long serialVersionUID = -512702014L; + /* + * Constructor + */ public ImmunizationRecommendationRecommendationProtocolComponent() { super(); } @@ -951,10 +966,16 @@ public class ImmunizationRecommendation extends DomainResource { private static final long serialVersionUID = 641058495L; + /* + * Constructor + */ public ImmunizationRecommendation() { super(); } + /* + * Constructor + */ public ImmunizationRecommendation(Reference patient) { super(); this.patient = patient; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java index 023406a19f6..01633aaac35 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java @@ -29,21 +29,21 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A set of information summarized from a list of other resources. */ -@ResourceDef(name="List_", profile="http://hl7.org/fhir/Profile/List_") +@ResourceDef(name="List", profile="http://hl7.org/fhir/Profile/List_") public class List_ extends DomainResource { public enum ListStatus { @@ -219,7 +219,7 @@ public class List_ extends DomainResource { } @Block() - public static class ListEntryComponent extends BackboneElement { + public static class ListEntryComponent extends BackboneElement implements IBaseBackboneElement { /** * The flag allows the system constructing the list to make one or more statements about the role and significance of the item in the list. */ @@ -255,10 +255,16 @@ public class List_ extends DomainResource { private static final long serialVersionUID = -27973283L; + /* + * Constructor + */ public ListEntryComponent() { super(); } + /* + * Constructor + */ public ListEntryComponent(Reference item) { super(); this.item = item; @@ -583,10 +589,16 @@ public class List_ extends DomainResource { private static final long serialVersionUID = -558571391L; + /* + * Constructor + */ public List_() { super(); } + /* + * Constructor + */ public List_(Enumeration status, Enumeration mode) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java index cfb0db4771b..a5e6141ec62 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import java.math.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Details and position information for a physical place where services are provided and resources and participants may be stored, found, contained or accommodated. @@ -206,7 +206,7 @@ public class Location extends DomainResource { } @Block() - public static class LocationPositionComponent extends BackboneElement { + public static class LocationPositionComponent extends BackboneElement implements IBaseBackboneElement { /** * Longitude. The value domain and the interpretation are the same as for the text of the longitude element in KML (see notes below). */ @@ -230,10 +230,16 @@ public class Location extends DomainResource { private static final long serialVersionUID = -74276134L; + /* + * Constructor + */ public LocationPositionComponent() { super(); } + /* + * Constructor + */ public LocationPositionComponent(DecimalType longitude, DecimalType latitude) { super(); this.longitude = longitude; @@ -520,6 +526,9 @@ public class Location extends DomainResource { private static final long serialVersionUID = -520735603L; + /* + * Constructor + */ public Location() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java index 2ea10e5cb64..3a02b8adee3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A photo, video, or audio recording acquired or used in healthcare. The actual content may be inline or provided by direct reference. @@ -228,10 +228,16 @@ public class Media extends DomainResource { private static final long serialVersionUID = -280764739L; + /* + * Constructor + */ public Media() { super(); } + /* + * Constructor + */ public Media(Enumeration type, Attachment content) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java index 95086ea9fc0..f7c2ef43115 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Primarily used for identification and definition of Medication, but also covers ingredients and packaging. @@ -119,7 +119,7 @@ public class Medication extends DomainResource { } @Block() - public static class MedicationProductComponent extends BackboneElement { + public static class MedicationProductComponent extends BackboneElement implements IBaseBackboneElement { /** * Describes the form of the item. Powder; tables; carton. */ @@ -143,6 +143,9 @@ public class Medication extends DomainResource { private static final long serialVersionUID = 1132853671L; + /* + * Constructor + */ public MedicationProductComponent() { super(); } @@ -304,7 +307,7 @@ public class Medication extends DomainResource { } @Block() - public static class MedicationProductIngredientComponent extends BackboneElement { + public static class MedicationProductIngredientComponent extends BackboneElement implements IBaseBackboneElement { /** * The actual ingredient - either a substance (simple ingredient) or another medication. */ @@ -326,10 +329,16 @@ public class Medication extends DomainResource { private static final long serialVersionUID = -1217232889L; + /* + * Constructor + */ public MedicationProductIngredientComponent() { super(); } + /* + * Constructor + */ public MedicationProductIngredientComponent(Reference item) { super(); this.item = item; @@ -440,7 +449,7 @@ public class Medication extends DomainResource { } @Block() - public static class MedicationProductBatchComponent extends BackboneElement { + public static class MedicationProductBatchComponent extends BackboneElement implements IBaseBackboneElement { /** * The assigned lot number of a batch of the specified product. */ @@ -457,6 +466,9 @@ public class Medication extends DomainResource { private static final long serialVersionUID = 1982738755L; + /* + * Constructor + */ public MedicationProductBatchComponent() { super(); } @@ -603,7 +615,7 @@ public class Medication extends DomainResource { } @Block() - public static class MedicationPackageComponent extends BackboneElement { + public static class MedicationPackageComponent extends BackboneElement implements IBaseBackboneElement { /** * The kind of container that this package comes as. */ @@ -620,6 +632,9 @@ public class Medication extends DomainResource { private static final long serialVersionUID = 503772472L; + /* + * Constructor + */ public MedicationPackageComponent() { super(); } @@ -734,7 +749,7 @@ public class Medication extends DomainResource { } @Block() - public static class MedicationPackageContentComponent extends BackboneElement { + public static class MedicationPackageContentComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies one of the items in the package. */ @@ -756,10 +771,16 @@ public class Medication extends DomainResource { private static final long serialVersionUID = -1385430192L; + /* + * Constructor + */ public MedicationPackageContentComponent() { super(); } + /* + * Constructor + */ public MedicationPackageContentComponent(Reference item) { super(); this.item = item; @@ -930,6 +951,9 @@ public class Medication extends DomainResource { private static final long serialVersionUID = 385691577L; + /* + * Constructor + */ public Medication() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java index f8146f30134..b7254061751 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Describes the event of a patient consuming or otherwise being administered a medication. This may be as simple as swallowing a tablet or it may be a long running infusion. Related resources tie this event to the authorizing prescription, and the specific encounter between patient and health care practitioner. @@ -161,7 +161,7 @@ public class MedicationAdministration extends DomainResource { } @Block() - public static class MedicationAdministrationDosageComponent extends BackboneElement { + public static class MedicationAdministrationDosageComponent extends BackboneElement implements IBaseBackboneElement { /** * Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. */ @@ -206,6 +206,9 @@ public class MedicationAdministration extends DomainResource { private static final long serialVersionUID = -358534919L; + /* + * Constructor + */ public MedicationAdministrationDosageComponent() { super(); } @@ -561,10 +564,16 @@ public class MedicationAdministration extends DomainResource { private static final long serialVersionUID = 1898346148L; + /* + * Constructor + */ public MedicationAdministration() { super(); } + /* + * Constructor + */ public MedicationAdministration(Enumeration status, Reference patient, Type effectiveTime) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java index 9b9e62ebcfb..96669503b3f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Dispensing a medication to a named patient. This includes a description of the supply provided and the instructions for administering the medication. @@ -161,7 +161,7 @@ public class MedicationDispense extends DomainResource { } @Block() - public static class MedicationDispenseDosageInstructionComponent extends BackboneElement { + public static class MedicationDispenseDosageInstructionComponent extends BackboneElement implements IBaseBackboneElement { /** * Additional instructions such as "Swallow with plenty of water" which may or may not be coded. */ @@ -227,6 +227,9 @@ public class MedicationDispense extends DomainResource { private static final long serialVersionUID = -1523433515L; + /* + * Constructor + */ public MedicationDispenseDosageInstructionComponent() { super(); } @@ -557,7 +560,7 @@ public class MedicationDispense extends DomainResource { } @Block() - public static class MedicationDispenseSubstitutionComponent extends BackboneElement { + public static class MedicationDispenseSubstitutionComponent extends BackboneElement implements IBaseBackboneElement { /** * A code signifying whether a different drug was dispensed from what was prescribed. */ @@ -586,10 +589,16 @@ public class MedicationDispense extends DomainResource { private static final long serialVersionUID = 1218245830L; + /* + * Constructor + */ public MedicationDispenseSubstitutionComponent() { super(); } + /* + * Constructor + */ public MedicationDispenseSubstitutionComponent(CodeableConcept type) { super(); this.type = type; @@ -916,6 +925,9 @@ public class MedicationDispense extends DomainResource { private static final long serialVersionUID = -217601399L; + /* + * Constructor + */ public MedicationDispense() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java index a4e62eb8963..0bdbd197bc9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationPrescription.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * An order for both supply of the medication and the instructions for administration of the medicine to a patient. @@ -189,7 +189,7 @@ public class MedicationPrescription extends DomainResource { } @Block() - public static class MedicationPrescriptionDosageInstructionComponent extends BackboneElement { + public static class MedicationPrescriptionDosageInstructionComponent extends BackboneElement implements IBaseBackboneElement { /** * Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. */ @@ -262,6 +262,9 @@ public class MedicationPrescription extends DomainResource { private static final long serialVersionUID = -1144367815L; + /* + * Constructor + */ public MedicationPrescriptionDosageInstructionComponent() { super(); } @@ -643,7 +646,7 @@ public class MedicationPrescription extends DomainResource { } @Block() - public static class MedicationPrescriptionDispenseComponent extends BackboneElement { + public static class MedicationPrescriptionDispenseComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies the medication being administered. This is a link to a resource that represents the medication which may be the details of the medication or simply an attribute carrying a code that identifies the medication from a known list of medications. */ @@ -686,6 +689,9 @@ public class MedicationPrescription extends DomainResource { private static final long serialVersionUID = -44233312L; + /* + * Constructor + */ public MedicationPrescriptionDispenseComponent() { super(); } @@ -902,7 +908,7 @@ public class MedicationPrescription extends DomainResource { } @Block() - public static class MedicationPrescriptionSubstitutionComponent extends BackboneElement { + public static class MedicationPrescriptionSubstitutionComponent extends BackboneElement implements IBaseBackboneElement { /** * A code signifying whether a different drug should be dispensed from what was prescribed. */ @@ -919,10 +925,16 @@ public class MedicationPrescription extends DomainResource { private static final long serialVersionUID = 1693602518L; + /* + * Constructor + */ public MedicationPrescriptionSubstitutionComponent() { super(); } + /* + * Constructor + */ public MedicationPrescriptionSubstitutionComponent(CodeableConcept type) { super(); this.type = type; @@ -1123,6 +1135,9 @@ public class MedicationPrescription extends DomainResource { private static final long serialVersionUID = 277504612L; + /* + * Constructor + */ public MedicationPrescription() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java index fb80ebeef91..f07c8e24117 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A record of medication being taken by a patient, or that the medication has been given to a patient where the record is the result of a report from the patient or another clinician. @@ -133,7 +133,7 @@ public class MedicationStatement extends DomainResource { } @Block() - public static class MedicationStatementDosageComponent extends BackboneElement { + public static class MedicationStatementDosageComponent extends BackboneElement implements IBaseBackboneElement { /** * Free text dosage instructions can be used for cases where the instructions are too complex to code. When coded instructions are present, the free text instructions may still be present for display to humans taking or administering the medication. */ @@ -199,6 +199,9 @@ public class MedicationStatement extends DomainResource { private static final long serialVersionUID = 1729854997L; + /* + * Constructor + */ public MedicationStatementDosageComponent() { super(); } @@ -618,10 +621,16 @@ public class MedicationStatement extends DomainResource { private static final long serialVersionUID = -1525633004L; + /* + * Constructor + */ public MedicationStatement() { super(); } + /* + * Constructor + */ public MedicationStatement(Enumeration status) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java index fb211aa9909..48789e2d8e8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * The header for a message exchange that is either requesting or responding to an action. The Reference(s) that are the subject of the action as well as other Information related to the action are typically transmitted in a bundle in which the MessageHeader resource instance is the first resource in the bundle. @@ -133,7 +133,7 @@ public class MessageHeader extends DomainResource { } @Block() - public static class MessageHeaderResponseComponent extends BackboneElement { + public static class MessageHeaderResponseComponent extends BackboneElement implements IBaseBackboneElement { /** * The id of the message that this message is a response to. */ @@ -162,10 +162,16 @@ public class MessageHeader extends DomainResource { private static final long serialVersionUID = 1419103693L; + /* + * Constructor + */ public MessageHeaderResponseComponent() { super(); } + /* + * Constructor + */ public MessageHeaderResponseComponent(IdType identifier, Enumeration code) { super(); this.identifier = identifier; @@ -351,7 +357,7 @@ public class MessageHeader extends DomainResource { } @Block() - public static class MessageSourceComponent extends BackboneElement { + public static class MessageSourceComponent extends BackboneElement implements IBaseBackboneElement { /** * Human-readable name for the source system. */ @@ -389,10 +395,16 @@ public class MessageHeader extends DomainResource { private static final long serialVersionUID = -115878196L; + /* + * Constructor + */ public MessageSourceComponent() { super(); } + /* + * Constructor + */ public MessageSourceComponent(UriType endpoint) { super(); this.endpoint = endpoint; @@ -665,7 +677,7 @@ public class MessageHeader extends DomainResource { } @Block() - public static class MessageDestinationComponent extends BackboneElement { + public static class MessageDestinationComponent extends BackboneElement implements IBaseBackboneElement { /** * Human-readable name for the target system. */ @@ -694,10 +706,16 @@ public class MessageHeader extends DomainResource { private static final long serialVersionUID = -2097633309L; + /* + * Constructor + */ public MessageDestinationComponent() { super(); } + /* + * Constructor + */ public MessageDestinationComponent(UriType endpoint) { super(); this.endpoint = endpoint; @@ -996,10 +1014,16 @@ public class MessageHeader extends DomainResource { private static final long serialVersionUID = 1866986127L; + /* + * Constructor + */ public MessageHeader() { super(); } + /* + * Constructor + */ public MessageHeader(IdType identifier, InstantType timestamp, Coding event, MessageSourceComponent source) { super(); this.identifier = identifier; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java index 06d3ee76b23..06b759112ef 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * The metadata about a resource. This is content in the resource that is maintained by the infrastructure. Changes to the content may not always be associated with version changes to the resource. @@ -81,6 +82,9 @@ public class Meta extends Type implements IBaseMetaType { private static final long serialVersionUID = 867134915L; + /* + * Constructor + */ public Meta() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java index bb3ff40dd5a..9551c94ae05 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Money.java @@ -29,9 +29,10 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java index c65c4a04a40..1496c1d0612 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A curated namespace that issues unique symbols within that namespace for the identification of concepts, people, devices, etc. Represents a "System" used within the Identifier and Coding data types. @@ -234,7 +234,7 @@ public class NamingSystem extends DomainResource { } @Block() - public static class NamingSystemUniqueIdComponent extends BackboneElement { + public static class NamingSystemUniqueIdComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies the unique identifier scheme used for this particular identifier. */ @@ -265,10 +265,16 @@ public class NamingSystem extends DomainResource { private static final long serialVersionUID = -250649344L; + /* + * Constructor + */ public NamingSystemUniqueIdComponent() { super(); } + /* + * Constructor + */ public NamingSystemUniqueIdComponent(Enumeration type, StringType value) { super(); this.type = type; @@ -482,7 +488,7 @@ public class NamingSystem extends DomainResource { } @Block() - public static class NamingSystemContactComponent extends BackboneElement { + public static class NamingSystemContactComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of an individual to contact regarding the naming system. */ @@ -499,6 +505,9 @@ public class NamingSystem extends DomainResource { private static final long serialVersionUID = -1179697803L; + /* + * Constructor + */ public NamingSystemContactComponent() { super(); } @@ -735,10 +744,16 @@ public class NamingSystem extends DomainResource { private static final long serialVersionUID = -241224889L; + /* + * Constructor + */ public NamingSystem() { super(); } + /* + * Constructor + */ public NamingSystem(Enumeration type, StringType name, DateTimeType date, Enumeration status) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java index 01e9325a710..7acf129d5ea 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.xhtml.XhtmlNode; @@ -38,6 +38,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A human-readable formatted text, including images. @@ -161,10 +162,16 @@ public class Narrative extends BaseNarrative implements INarrative { private static final long serialVersionUID = 1463852859L; + /* + * Constructor + */ public Narrative() { super(); } + /* + * Constructor + */ public Narrative(Enumeration status, XhtmlNode div) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java index 5bbf7dcc2c6..cdcf3088e53 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A request to supply a diet, formula feeding (enteral) or oral nutritional supplement to a patient/resident. @@ -203,7 +203,7 @@ public class NutritionOrder extends DomainResource { } @Block() - public static class NutritionOrderOralDietComponent extends BackboneElement { + public static class NutritionOrderOralDietComponent extends BackboneElement implements IBaseBackboneElement { /** * The kind of diet or dietary restriction such as fiber restricted diet or diabetic diet. */ @@ -248,6 +248,9 @@ public class NutritionOrder extends DomainResource { private static final long serialVersionUID = -1101476668L; + /* + * Constructor + */ public NutritionOrderOralDietComponent() { super(); } @@ -554,7 +557,7 @@ public class NutritionOrder extends DomainResource { } @Block() - public static class NutritionOrderOralDietNutrientComponent extends BackboneElement { + public static class NutritionOrderOralDietNutrientComponent extends BackboneElement implements IBaseBackboneElement { /** * The nutrient that is being modified such as carbohydrate or sodium. */ @@ -571,6 +574,9 @@ public class NutritionOrder extends DomainResource { private static final long serialVersionUID = 1042462093L; + /* + * Constructor + */ public NutritionOrderOralDietNutrientComponent() { super(); } @@ -665,7 +671,7 @@ public class NutritionOrder extends DomainResource { } @Block() - public static class NutritionOrderOralDietTextureComponent extends BackboneElement { + public static class NutritionOrderOralDietTextureComponent extends BackboneElement implements IBaseBackboneElement { /** * Any texture modifications (for solid foods) that should be made, e.g. easy to chew, chopped, ground, and pureed. */ @@ -682,6 +688,9 @@ public class NutritionOrder extends DomainResource { private static final long serialVersionUID = -56402817L; + /* + * Constructor + */ public NutritionOrderOralDietTextureComponent() { super(); } @@ -776,7 +785,7 @@ public class NutritionOrder extends DomainResource { } @Block() - public static class NutritionOrderSupplementComponent extends BackboneElement { + public static class NutritionOrderSupplementComponent extends BackboneElement implements IBaseBackboneElement { /** * The kind of nutritional supplement product required such as a high protein or pediatric clear liquid supplement. */ @@ -814,6 +823,9 @@ public class NutritionOrder extends DomainResource { private static final long serialVersionUID = 952780616L; + /* + * Constructor + */ public NutritionOrderSupplementComponent() { super(); } @@ -1039,7 +1051,7 @@ public class NutritionOrder extends DomainResource { } @Block() - public static class NutritionOrderEnteralFormulaComponent extends BackboneElement { + public static class NutritionOrderEnteralFormulaComponent extends BackboneElement implements IBaseBackboneElement { /** * Free text formula administration, feeding instructions or additional instructions or information. */ @@ -1126,6 +1138,9 @@ public class NutritionOrder extends DomainResource { private static final long serialVersionUID = -1342980650L; + /* + * Constructor + */ public NutritionOrderEnteralFormulaComponent() { super(); } @@ -1671,10 +1686,16 @@ public class NutritionOrder extends DomainResource { private static final long serialVersionUID = 1139624085L; + /* + * Constructor + */ public NutritionOrder() { super(); } + /* + * Constructor + */ public NutritionOrder(Reference patient, DateTimeType dateTime) { super(); this.patient = patient; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java index 30cdfb1bc8d..a97e69398f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Measurements and simple assertions made about a patient, device or other subject. @@ -473,7 +473,7 @@ public class Observation extends DomainResource { } @Block() - public static class ObservationReferenceRangeComponent extends BackboneElement { + public static class ObservationReferenceRangeComponent extends BackboneElement implements IBaseBackboneElement { /** * The value of the low bound of the reference range. If this element is omitted, the low bound of the reference range is assumed to be meaningless. (e.g. reference range is <2.3) If the low.comparator element is missing, it is assumed to be '>'. */ @@ -511,6 +511,9 @@ public class Observation extends DomainResource { private static final long serialVersionUID = 230621180L; + /* + * Constructor + */ public ObservationReferenceRangeComponent() { super(); } @@ -710,7 +713,7 @@ public class Observation extends DomainResource { } @Block() - public static class ObservationRelatedComponent extends BackboneElement { + public static class ObservationRelatedComponent extends BackboneElement implements IBaseBackboneElement { /** * A code specifying the kind of relationship that exists with the target observation. */ @@ -732,10 +735,16 @@ public class Observation extends DomainResource { private static final long serialVersionUID = 1078793488L; + /* + * Constructor + */ public ObservationRelatedComponent() { super(); } + /* + * Constructor + */ public ObservationRelatedComponent(Reference target) { super(); this.target = target; @@ -1037,10 +1046,16 @@ other observer (for example a relative or EMT), or any observation made about th private static final long serialVersionUID = 1157047775L; + /* + * Constructor + */ public Observation() { super(); } + /* + * Constructor + */ public Observation(CodeableConcept code, Enumeration status) { super(); this.code = code; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java index 17ab83a7c68..c16f47f8253 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A formal computable definition of an operation (on the RESTful interface) or a named query (using the search interaction). @@ -192,7 +192,7 @@ public class OperationDefinition extends DomainResource { } @Block() - public static class OperationDefinitionContactComponent extends BackboneElement { + public static class OperationDefinitionContactComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of an individual to contact regarding the operation definition. */ @@ -209,6 +209,9 @@ public class OperationDefinition extends DomainResource { private static final long serialVersionUID = -1179697803L; + /* + * Constructor + */ public OperationDefinitionContactComponent() { super(); } @@ -348,7 +351,7 @@ public class OperationDefinition extends DomainResource { } @Block() - public static class OperationDefinitionParameterComponent extends BackboneElement { + public static class OperationDefinitionParameterComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of used to identify the parameter. */ @@ -412,10 +415,16 @@ public class OperationDefinition extends DomainResource { private static final long serialVersionUID = 633191560L; + /* + * Constructor + */ public OperationDefinitionParameterComponent() { super(); } + /* + * Constructor + */ public OperationDefinitionParameterComponent(CodeType name, Enumeration use, IntegerType min, StringType max) { super(); this.name = name; @@ -850,7 +859,7 @@ public class OperationDefinition extends DomainResource { } @Block() - public static class OperationDefinitionParameterPartComponent extends BackboneElement { + public static class OperationDefinitionParameterPartComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of used to identify the parameter. */ @@ -900,10 +909,16 @@ public class OperationDefinition extends DomainResource { private static final long serialVersionUID = -856151797L; + /* + * Constructor + */ public OperationDefinitionParameterPartComponent() { super(); } + /* + * Constructor + */ public OperationDefinitionParameterPartComponent(CodeType name, UnsignedIntType min, StringType max, CodeType type) { super(); this.name = name; @@ -1378,10 +1393,16 @@ public class OperationDefinition extends DomainResource { private static final long serialVersionUID = 1747303098L; + /* + * Constructor + */ public OperationDefinition() { super(); } + /* + * Constructor + */ public OperationDefinition(StringType name, Enumeration status, Enumeration kind, CodeType code, BooleanType system, BooleanType instance) { super(); this.name = name; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java index 06adab7b46d..b2f45ab867b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A collection of error, warning or information messages that result from a system action. @@ -147,7 +147,7 @@ public class OperationOutcome extends DomainResource { } @Block() - public static class OperationOutcomeIssueComponent extends BackboneElement { + public static class OperationOutcomeIssueComponent extends BackboneElement implements IBaseBackboneElement { /** * Indicates whether the issue indicates a variation from successful processing. */ @@ -178,10 +178,16 @@ public class OperationOutcome extends DomainResource { private static final long serialVersionUID = -869408333L; + /* + * Constructor + */ public OperationOutcomeIssueComponent() { super(); } + /* + * Constructor + */ public OperationOutcomeIssueComponent(Enumeration severity, CodeableConcept code) { super(); this.severity = severity; @@ -420,6 +426,9 @@ public class OperationOutcome extends DomainResource { private static final long serialVersionUID = -152150052L; + /* + * Constructor + */ public OperationOutcome() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java index 8c32e3361cf..9e6ccad2bb0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Order.java @@ -29,15 +29,15 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A request to perform an action. @@ -46,7 +46,7 @@ import org.hl7.fhir.instance.model.api.*; public class Order extends DomainResource { @Block() - public static class OrderWhenComponent extends BackboneElement { + public static class OrderWhenComponent extends BackboneElement implements IBaseBackboneElement { /** * Code specifies when request should be done. The code may simply be a priority code. */ @@ -63,6 +63,9 @@ public class Order extends DomainResource { private static final long serialVersionUID = 307115287L; + /* + * Constructor + */ public OrderWhenComponent() { super(); } @@ -246,6 +249,9 @@ public class Order extends DomainResource { private static final long serialVersionUID = 595782234L; + /* + * Constructor + */ public Order() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java index 295f85984b8..40c878f8cf0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A response to an order. @@ -289,10 +289,16 @@ public class OrderResponse extends DomainResource { private static final long serialVersionUID = -1983664888L; + /* + * Constructor + */ public OrderResponse() { super(); } + /* + * Constructor + */ public OrderResponse(Reference request, Enumeration orderStatus) { super(); this.request = request; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java index f7bb9db91ca..c5656ab1f46 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A formally or informally recognized grouping of people or organizations formed for the purpose of achieving some form of collective action. Includes companies, institutions, corporations, departments, community groups, healthcare practice groups, etc. @@ -47,7 +47,7 @@ import org.hl7.fhir.instance.model.api.*; public class Organization extends DomainResource { @Block() - public static class OrganizationContactComponent extends BackboneElement { + public static class OrganizationContactComponent extends BackboneElement implements IBaseBackboneElement { /** * Indicates a purpose for which the contact can be reached. */ @@ -78,6 +78,9 @@ public class Organization extends DomainResource { private static final long serialVersionUID = 1831121305L; + /* + * Constructor + */ public OrganizationContactComponent() { super(); } @@ -307,6 +310,9 @@ public class Organization extends DomainResource { private static final long serialVersionUID = 1766834739L; + /* + * Constructor + */ public Organization() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java index e547727d89c..c7ef9a8e2a9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Parameters.java @@ -29,25 +29,25 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This special resource type is used to represent [operation](operations.html] request and response. It has no other use, and there is no RESTful end=point associated with it. */ @ResourceDef(name="Parameters", profile="http://hl7.org/fhir/Profile/Parameters") -public class Parameters extends Resource { +public class Parameters extends Resource implements IBaseParameters { @Block() - public static class ParametersParameterComponent extends BackboneElement { + public static class ParametersParameterComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of the parameter (reference to the operation definition). */ @@ -78,10 +78,16 @@ public class Parameters extends Resource { private static final long serialVersionUID = 2101270343L; + /* + * Constructor + */ public ParametersParameterComponent() { super(); } + /* + * Constructor + */ public ParametersParameterComponent(StringType name) { super(); this.name = name; @@ -261,7 +267,7 @@ public class Parameters extends Resource { } @Block() - public static class ParametersParameterPartComponent extends BackboneElement { + public static class ParametersParameterPartComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of the parameter (reference to the operation definition). */ @@ -285,10 +291,16 @@ public class Parameters extends Resource { private static final long serialVersionUID = 1120601371L; + /* + * Constructor + */ public ParametersParameterPartComponent() { super(); } + /* + * Constructor + */ public ParametersParameterPartComponent(StringType name) { super(); this.name = name; @@ -430,6 +442,9 @@ public class Parameters extends Resource { private static final long serialVersionUID = -1495940293L; + /* + * Constructor + */ public Parameters() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java index ef7c21e718e..9189524aa77 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Patient.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Demographics and other administrative information about an individual or animal receiving care or other health-related services. @@ -233,7 +233,7 @@ public class Patient extends DomainResource { } @Block() - public static class ContactComponent extends BackboneElement { + public static class ContactComponent extends BackboneElement implements IBaseBackboneElement { /** * The nature of the relationship between the patient and the contact person. */ @@ -290,6 +290,9 @@ public class Patient extends DomainResource { private static final long serialVersionUID = 364269017L; + /* + * Constructor + */ public ContactComponent() { super(); } @@ -603,7 +606,7 @@ public class Patient extends DomainResource { } @Block() - public static class AnimalComponent extends BackboneElement { + public static class AnimalComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies the high level taxonomic categorization of the kind of animal. */ @@ -627,10 +630,16 @@ public class Patient extends DomainResource { private static final long serialVersionUID = -549738382L; + /* + * Constructor + */ public AnimalComponent() { super(); } + /* + * Constructor + */ public AnimalComponent(CodeableConcept species) { super(); this.species = species; @@ -753,7 +762,7 @@ public class Patient extends DomainResource { } @Block() - public static class PatientCommunicationComponent extends BackboneElement { + public static class PatientCommunicationComponent extends BackboneElement implements IBaseBackboneElement { /** * The ISO-639-1 alpha 2 code in lower case for the language, optionally followed by a hyphen and the ISO-3166-1 alpha 2 code for the region in upper case. E.g. "en" for English, or "en-US" for American English versus "en-EN" for England English. */ @@ -770,10 +779,16 @@ public class Patient extends DomainResource { private static final long serialVersionUID = 633792918L; + /* + * Constructor + */ public PatientCommunicationComponent() { super(); } + /* + * Constructor + */ public PatientCommunicationComponent(CodeableConcept language) { super(); this.language = language; @@ -890,7 +905,7 @@ public class Patient extends DomainResource { } @Block() - public static class PatientLinkComponent extends BackboneElement { + public static class PatientLinkComponent extends BackboneElement implements IBaseBackboneElement { /** * The other patient resource that the link refers to. */ @@ -912,10 +927,16 @@ public class Patient extends DomainResource { private static final long serialVersionUID = -1942104050L; + /* + * Constructor + */ public PatientLinkComponent() { super(); } + /* + * Constructor + */ public PatientLinkComponent(Reference other, Enumeration type) { super(); this.other = other; @@ -1183,6 +1204,9 @@ public class Patient extends DomainResource { private static final long serialVersionUID = 2057666410L; + /* + * Constructor + */ public Patient() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java index 56895272c79..2eb57cdc7b3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentNotice.java @@ -29,15 +29,15 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides the status of the payment for goods and services rendered, and the request and response resource references. @@ -142,10 +142,16 @@ public class PaymentNotice extends DomainResource { private static final long serialVersionUID = -394826458L; + /* + * Constructor + */ public PaymentNotice() { super(); } + /* + * Constructor + */ public PaymentNotice(Coding paymentStatus) { super(); this.paymentStatus = paymentStatus; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java index befecc1af7a..3d225aac039 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides payment details and claim references supporting a bulk payment. @@ -119,7 +119,7 @@ public class PaymentReconciliation extends DomainResource { } @Block() - public static class DetailsComponent extends BackboneElement { + public static class DetailsComponent extends BackboneElement implements IBaseBackboneElement { /** * Code to indicate the nature of the payment, adjustment, funds advance, etc. */ @@ -191,10 +191,16 @@ public class PaymentReconciliation extends DomainResource { private static final long serialVersionUID = -1644048062L; + /* + * Constructor + */ public DetailsComponent() { super(); } + /* + * Constructor + */ public DetailsComponent(Coding type) { super(); this.type = type; @@ -519,7 +525,7 @@ public class PaymentReconciliation extends DomainResource { } @Block() - public static class NotesComponent extends BackboneElement { + public static class NotesComponent extends BackboneElement implements IBaseBackboneElement { /** * The note purpose: Print/Display. */ @@ -536,6 +542,9 @@ public class PaymentReconciliation extends DomainResource { private static final long serialVersionUID = 129959202L; + /* + * Constructor + */ public NotesComponent() { super(); } @@ -781,10 +790,16 @@ public class PaymentReconciliation extends DomainResource { private static final long serialVersionUID = 1602249640L; + /* + * Constructor + */ public PaymentReconciliation() { super(); } + /* + * Constructor + */ public PaymentReconciliation(Money total) { super(); this.total = total; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java index 2cd5aafd5ac..de26fbd3084 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Period.java @@ -29,13 +29,14 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A time period defined by a start and end date and optionally time. @@ -59,6 +60,9 @@ public class Period extends Type implements ICompositeType { private static final long serialVersionUID = 649791751L; + /* + * Constructor + */ public Period() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java index 74d45a96e44..9d6fee98609 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Person.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Demographics and administrative information about a person independent of a specific health-related context. @@ -247,7 +247,7 @@ public class Person extends DomainResource { } @Block() - public static class PersonLinkComponent extends BackboneElement { + public static class PersonLinkComponent extends BackboneElement implements IBaseBackboneElement { /** * The resource to which this actual person is associated. */ @@ -269,10 +269,16 @@ public class Person extends DomainResource { private static final long serialVersionUID = 508763647L; + /* + * Constructor + */ public PersonLinkComponent() { super(); } + /* + * Constructor + */ public PersonLinkComponent(Reference target) { super(); this.target = target; @@ -484,6 +490,9 @@ public class Person extends DomainResource { private static final long serialVersionUID = -2072707611L; + /* + * Constructor + */ public Person() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java index 2d45c0e16e9..82fba467b92 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Practitioner.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A person who is directly or indirectly involved in the provisioning of healthcare. @@ -147,7 +147,7 @@ public class Practitioner extends DomainResource { } @Block() - public static class PractitionerPractitionerRoleComponent extends BackboneElement { + public static class PractitionerPractitionerRoleComponent extends BackboneElement implements IBaseBackboneElement { /** * The Organization where the Practitioner performs the roles associated. */ @@ -207,6 +207,9 @@ public class Practitioner extends DomainResource { private static final long serialVersionUID = -2146177018L; + /* + * Constructor + */ public PractitionerPractitionerRoleComponent() { super(); } @@ -530,7 +533,7 @@ public class Practitioner extends DomainResource { } @Block() - public static class PractitionerQualificationComponent extends BackboneElement { + public static class PractitionerQualificationComponent extends BackboneElement implements IBaseBackboneElement { /** * An identifier that applies to this person's qualification in this role. */ @@ -566,10 +569,16 @@ public class Practitioner extends DomainResource { private static final long serialVersionUID = 1095219071L; + /* + * Constructor + */ public PractitionerQualificationComponent() { super(); } + /* + * Constructor + */ public PractitionerQualificationComponent(CodeableConcept code) { super(); this.code = code; @@ -829,6 +838,9 @@ public class Practitioner extends DomainResource { private static final long serialVersionUID = 781100268L; + /* + * Constructor + */ public Practitioner() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PrimitiveType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PrimitiveType.java index 1b0f5cf4107..74069cd03b5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PrimitiveType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PrimitiveType.java @@ -1,5 +1,6 @@ package org.hl7.fhir.instance.model; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.hl7.fhir.instance.model.api.IBaseHasExtensions; @@ -7,11 +8,11 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType; public abstract class PrimitiveType extends Type implements IPrimitiveType, IBaseHasExtensions { - private static final long serialVersionUID = 3L; + private static final long serialVersionUID = 3L; + + private T myCoercedValue; + private String myStringValue; - private T myCoercedValue; - private String myStringValue; - public T getValue() { return myCoercedValue; } @@ -25,11 +26,6 @@ public abstract class PrimitiveType extends Type implements IPrimitiveType return new HashCodeBuilder().append(getValue()).toHashCode(); } - @Override - public boolean isEmpty() { - return super.isEmpty() && getValue() == null; - } - public PrimitiveType setValue(T theValue) { myCoercedValue = theValue; updateStringValue(); @@ -45,6 +41,11 @@ public abstract class PrimitiveType extends Type implements IPrimitiveType } } + @Override + public boolean isEmpty() { + return super.isEmpty() && StringUtils.isBlank(getValueAsString()); + } + public void fromStringValue(String theValue) { if (theValue == null) { myCoercedValue = null; @@ -79,17 +80,17 @@ public abstract class PrimitiveType extends Type implements IPrimitiveType } public boolean hasValue() { - return !isEmpty(); + return !isEmpty(); } - + public String getValueAsString() { return asStringValue(); } - + public void setValueAsString(String theValue) { fromStringValue(theValue); } - + protected Type typedCopy() { return copy(); } @@ -114,20 +115,20 @@ public abstract class PrimitiveType extends Type implements IPrimitiveType return b.isEquals(); } - @Override - public boolean equalsShallow(Base obj) { - if (obj == null) { - return false; - } - if (!(obj.getClass() == getClass())) { - return false; - } + @Override + public boolean equalsShallow(Base obj) { + if (obj == null) { + return false; + } + if (!(obj.getClass() == getClass())) { + return false; + } - PrimitiveType o = (PrimitiveType) obj; + PrimitiveType o = (PrimitiveType) obj; - EqualsBuilder b = new EqualsBuilder(); - b.append(getValue(), o.getValue()); - return b.isEquals(); - } + EqualsBuilder b = new EqualsBuilder(); + b.append(getValue(), o.getValue()); + return b.isEquals(); + } } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java index 57dc8b83d36..9cd821f323c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Procedure.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * An action that is or was performed on a patient. This can be a physical 'thing' like an operation, or less invasive like counseling or hypnotherapy. @@ -219,7 +219,7 @@ public class Procedure extends DomainResource { } @Block() - public static class ProcedureBodySiteComponent extends BackboneElement { + public static class ProcedureBodySiteComponent extends BackboneElement implements IBaseBackboneElement { /** * Detailed and structured anatomical location information. Multiple locations are allowed - e.g. multiple punch biopsies of a lesion. */ @@ -229,10 +229,16 @@ public class Procedure extends DomainResource { private static final long serialVersionUID = 1429072605L; + /* + * Constructor + */ public ProcedureBodySiteComponent() { super(); } + /* + * Constructor + */ public ProcedureBodySiteComponent(Type site) { super(); this.site = site; @@ -314,7 +320,7 @@ public class Procedure extends DomainResource { } @Block() - public static class ProcedurePerformerComponent extends BackboneElement { + public static class ProcedurePerformerComponent extends BackboneElement implements IBaseBackboneElement { /** * The practitioner who was involved in the procedure. */ @@ -336,6 +342,9 @@ public class Procedure extends DomainResource { private static final long serialVersionUID = -1975652413L; + /* + * Constructor + */ public ProcedurePerformerComponent() { super(); } @@ -445,7 +454,7 @@ public class Procedure extends DomainResource { } @Block() - public static class ProcedureRelatedItemComponent extends BackboneElement { + public static class ProcedureRelatedItemComponent extends BackboneElement implements IBaseBackboneElement { /** * The nature of the relationship. */ @@ -467,6 +476,9 @@ public class Procedure extends DomainResource { private static final long serialVersionUID = 41929784L; + /* + * Constructor + */ public ProcedureRelatedItemComponent() { super(); } @@ -601,7 +613,7 @@ public class Procedure extends DomainResource { } @Block() - public static class ProcedureDeviceComponent extends BackboneElement { + public static class ProcedureDeviceComponent extends BackboneElement implements IBaseBackboneElement { /** * The kind of change that happened to the device during the procedure. */ @@ -623,10 +635,16 @@ public class Procedure extends DomainResource { private static final long serialVersionUID = 1779937807L; + /* + * Constructor + */ public ProcedureDeviceComponent() { super(); } + /* + * Constructor + */ public ProcedureDeviceComponent(Reference manipulated) { super(); this.manipulated = manipulated; @@ -901,10 +919,16 @@ public class Procedure extends DomainResource { private static final long serialVersionUID = -1258770542L; + /* + * Constructor + */ public Procedure() { super(); } + /* + * Constructor + */ public Procedure(Reference patient, Enumeration status, CodeableConcept type) { super(); this.patient = patient; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java index 7ef5e1cc5da..70287c13e13 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcedureRequest.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A request for a procedure to be performed. May be a proposal or an order. @@ -331,7 +331,7 @@ public class ProcedureRequest extends DomainResource { } @Block() - public static class ProcedureRequestBodySiteComponent extends BackboneElement { + public static class ProcedureRequestBodySiteComponent extends BackboneElement implements IBaseBackboneElement { /** * Indicates the site on the subject's body where the procedure should be performed ( i.e. the target sites). */ @@ -341,10 +341,16 @@ public class ProcedureRequest extends DomainResource { private static final long serialVersionUID = 1429072605L; + /* + * Constructor + */ public ProcedureRequestBodySiteComponent() { super(); } + /* + * Constructor + */ public ProcedureRequestBodySiteComponent(Type site) { super(); this.site = site; @@ -545,10 +551,16 @@ public class ProcedureRequest extends DomainResource { private static final long serialVersionUID = -1687850759L; + /* + * Constructor + */ public ProcedureRequest() { super(); } + /* + * Constructor + */ public ProcedureRequest(Reference subject, CodeableConcept type) { super(); this.subject = subject; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java index 9d3edc8fbc4..53a48e8c906 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides the target, request and response, and action details for an action to be performed by the target on or about existing resources. @@ -147,7 +147,7 @@ public class ProcessRequest extends DomainResource { } @Block() - public static class ItemsComponent extends BackboneElement { + public static class ItemsComponent extends BackboneElement implements IBaseBackboneElement { /** * A service line number. */ @@ -157,10 +157,16 @@ public class ProcessRequest extends DomainResource { private static final long serialVersionUID = -1598360600L; + /* + * Constructor + */ public ItemsComponent() { super(); } + /* + * Constructor + */ public ItemsComponent(IntegerType sequenceLinkId) { super(); this.sequenceLinkId = sequenceLinkId; @@ -388,10 +394,16 @@ public class ProcessRequest extends DomainResource { private static final long serialVersionUID = -1852083956L; + /* + * Constructor + */ public ProcessRequest() { super(); } + /* + * Constructor + */ public ProcessRequest(Enumeration action) { super(); this.action = action; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java index 4146486bb39..ae634e3b5f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * This resource provides processing status, errors and notes from the processing of a resource. @@ -47,7 +47,7 @@ import org.hl7.fhir.instance.model.api.*; public class ProcessResponse extends DomainResource { @Block() - public static class ProcessResponseNotesComponent extends BackboneElement { + public static class ProcessResponseNotesComponent extends BackboneElement implements IBaseBackboneElement { /** * The note purpose: Print/Display. */ @@ -64,6 +64,9 @@ public class ProcessResponse extends DomainResource { private static final long serialVersionUID = 129959202L; + /* + * Constructor + */ public ProcessResponseNotesComponent() { super(); } @@ -295,6 +298,9 @@ public class ProcessResponse extends DomainResource { private static final long serialVersionUID = -1668062545L; + /* + * Constructor + */ public ProcessResponse() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java index a2001b3f098..773151c380a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Provenance of a resource is a record that describes entities and processes involved in producing and delivering or otherwise influencing that resource. Provenance provides a critical foundation for assessing authenticity, enabling trust, and allowing reproducibility. Provenance assertions are a form of contextual metadata and can themselves become important records with their own provenance. Provenance statement indicates clinical significance in terms of confidence in authenticity, reliability, and trustworthiness, integrity, and stage in lifecycle (e.g., Document Completion - has the artifact been legally authenticated), all of which may impact Security, Privacy, and Trust policies. @@ -147,7 +147,7 @@ public class Provenance extends DomainResource { } @Block() - public static class ProvenanceAgentComponent extends BackboneElement { + public static class ProvenanceAgentComponent extends BackboneElement implements IBaseBackboneElement { /** * The function of the agent with respect to the activity. */ @@ -178,10 +178,16 @@ public class Provenance extends DomainResource { private static final long serialVersionUID = -689391376L; + /* + * Constructor + */ public ProvenanceAgentComponent() { super(); } + /* + * Constructor + */ public ProvenanceAgentComponent(Coding role, Coding type) { super(); this.role = role; @@ -369,7 +375,7 @@ public class Provenance extends DomainResource { } @Block() - public static class ProvenanceEntityComponent extends BackboneElement { + public static class ProvenanceEntityComponent extends BackboneElement implements IBaseBackboneElement { /** * How the entity was used during the activity. */ @@ -407,10 +413,16 @@ public class Provenance extends DomainResource { private static final long serialVersionUID = 1533729633L; + /* + * Constructor + */ public ProvenanceEntityComponent() { super(); } + /* + * Constructor + */ public ProvenanceEntityComponent(Enumeration role, Coding type, UriType reference) { super(); this.role = role; @@ -730,10 +742,16 @@ public class Provenance extends DomainResource { private static final long serialVersionUID = 800452939L; + /* + * Constructor + */ public Provenance() { super(); } + /* + * Constructor + */ public Provenance(InstantType recorded) { super(); this.recorded = recorded; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java index 08ac7407f37..fb9fa9b4065 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -38,6 +38,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A measured amount (or an amount that can potentially be measured). Note that measured amounts include amounts that are not precisely quantified, including amounts involving arbitrary units and floating currencies. @@ -182,6 +183,9 @@ public class Quantity extends Type implements ICompositeType { private static final long serialVersionUID = -483422721L; + /* + * Constructor + */ public Quantity() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java index 78f0c73507c..c316f48deb8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A structured set of questions intended to guide the collection of answers. The questions are ordered and grouped into coherent subsets, corresponding to the structure of the grouping of the underlying questions. @@ -387,7 +387,7 @@ public class Questionnaire extends DomainResource { } @Block() - public static class GroupComponent extends BackboneElement { + public static class GroupComponent extends BackboneElement implements IBaseBackboneElement { /** * An identifier that is unique within the questionnaire allowing linkage to the equivalent group in a QuestionnaireAnswers resource. */ @@ -446,6 +446,9 @@ public class Questionnaire extends DomainResource { private static final long serialVersionUID = 494129548L; + /* + * Constructor + */ public GroupComponent() { super(); } @@ -878,7 +881,7 @@ public class Questionnaire extends DomainResource { } @Block() - public static class QuestionComponent extends BackboneElement { + public static class QuestionComponent extends BackboneElement implements IBaseBackboneElement { /** * An identifier that is unique within the questionnaire allowing linkage to the equivalent group in a [[[QuestionnaireAnswers]]] resource. */ @@ -942,6 +945,9 @@ public class Questionnaire extends DomainResource { private static final long serialVersionUID = 1655002985L; + /* + * Constructor + */ public QuestionComponent() { super(); } @@ -1424,10 +1430,16 @@ public class Questionnaire extends DomainResource { private static final long serialVersionUID = -852096969L; + /* + * Constructor + */ public Questionnaire() { super(); } + /* + * Constructor + */ public Questionnaire(Enumeration status, GroupComponent group) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireAnswers.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireAnswers.java index c7e3ea638f8..3ee4b12523a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireAnswers.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireAnswers.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A structured set of questions and their answers. The questions are ordered and grouped into coherent subsets, corresponding to the structure of the grouping of the underlying questions. @@ -133,7 +133,7 @@ public class QuestionnaireAnswers extends DomainResource { } @Block() - public static class GroupComponent extends BackboneElement { + public static class GroupComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies the group from the Questionnaire that corresponds to this group in the QuestionnaireAnswers resource. */ @@ -183,6 +183,9 @@ public class QuestionnaireAnswers extends DomainResource { private static final long serialVersionUID = -1045990435L; + /* + * Constructor + */ public GroupComponent() { super(); } @@ -515,7 +518,7 @@ public class QuestionnaireAnswers extends DomainResource { } @Block() - public static class QuestionComponent extends BackboneElement { + public static class QuestionComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies the question from the Questionnaire that corresponds to this question in the QuestionnaireAnswers resource. */ @@ -546,6 +549,9 @@ public class QuestionnaireAnswers extends DomainResource { private static final long serialVersionUID = -564009278L; + /* + * Constructor + */ public QuestionComponent() { super(); } @@ -783,7 +789,7 @@ public class QuestionnaireAnswers extends DomainResource { } @Block() - public static class QuestionAnswerComponent extends BackboneElement { + public static class QuestionAnswerComponent extends BackboneElement implements IBaseBackboneElement { /** * The answer (or one of the answers) provided by the respondant to the question. */ @@ -793,6 +799,9 @@ public class QuestionnaireAnswers extends DomainResource { private static final long serialVersionUID = -732981989L; + /* + * Constructor + */ public QuestionAnswerComponent() { super(); } @@ -1061,10 +1070,16 @@ public class QuestionnaireAnswers extends DomainResource { private static final long serialVersionUID = -949684393L; + /* + * Constructor + */ public QuestionnaireAnswers() { super(); } + /* + * Constructor + */ public QuestionnaireAnswers(Enumeration status) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java index e0a3f57dfb0..2a1323f41bb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Range.java @@ -29,13 +29,14 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A set of ordered Quantities defined by a low and high limit. @@ -59,6 +60,9 @@ public class Range extends Type implements ICompositeType { private static final long serialVersionUID = -474933350L; + /* + * Constructor + */ public Range() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java index 551de9a3de9..c2fd979d2b7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Ratio.java @@ -29,13 +29,14 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A relationship of two Quantity values - expressed as a numerator and a denominator. @@ -59,6 +60,9 @@ public class Ratio extends Type implements ICompositeType { private static final long serialVersionUID = 479922563L; + /* + * Constructor + */ public Ratio() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java index fa42c06828a..d2bdc4d5279 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,6 +37,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A reference from one resource to another. @@ -60,10 +61,40 @@ public class Reference extends BaseReference implements IBaseReference, IComposi private static final long serialVersionUID = 22777321L; + /* + * Constructor + */ public Reference() { super(); } + /** + * Constructor + * + * @param theReference The given reference string (e.g. "Patient/123" or "http://example.com/Patient/123") + */ + public Reference(String theReference) { + super(theReference); + } + + /** + * Constructor + * + * @param theReference The given reference as an IdType (e.g. "Patient/123" or "http://example.com/Patient/123") + */ + public Reference(IdType theReference) { + super(theReference); + } + + /** + * Constructor + * + * @param theResource The resource represented by this reference + */ + public Reference(IRefImplResource theResource) { + super(theResource); + } + /** * @return {@link #reference} (A reference to a location at which the other resource is found. The reference may be a relative reference, in which case it is relative to the service base URL, or an absolute URL that resolves to the location where the resource is found. The reference may be version specific or not. If the reference is not to a FHIR RESTful server, then it should be assumed to be version specific. Internal fragment references (start with '#') refer to contained resources.). This is the underlying object with id, value and extensions. The accessor "getReference" gives direct access to the value */ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java index c9f56a5e5b2..52f912ffb34 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Used to record and send details about a request for referral service or transfer of a patient to the care of another provider or provider organisation. @@ -320,10 +320,16 @@ public class ReferralRequest extends DomainResource { private static final long serialVersionUID = -1139252216L; + /* + * Constructor + */ public ReferralRequest() { super(); } + /* + * Constructor + */ public ReferralRequest(Enumeration status) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java index 028a0f098ea..112265787f2 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RelatedPerson.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Information about a person that is involved in the care for a patient, but who is not the target of healthcare, nor has a formal responsibility in the care process. @@ -216,10 +216,16 @@ public class RelatedPerson extends DomainResource { private static final long serialVersionUID = 1871047258L; + /* + * Constructor + */ public RelatedPerson() { super(); } + /* + * Constructor + */ public RelatedPerson(Reference patient) { super(); this.patient = patient; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java index 29e5ae939ad..4708f5d246d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java @@ -29,21 +29,20 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Base Resource for everything. */ -@ResourceDef(name="Resource", profile="http://hl7.org/fhir/Profile/Resource") public abstract class Resource extends BaseResource implements IRefImplResource { /** @@ -76,6 +75,9 @@ public abstract class Resource extends BaseResource implements IRefImplResource private static final long serialVersionUID = -559462759L; + /* + * Constructor + */ public Resource() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java index 6a2c374545c..57b43cbefdc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceFactory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 public class ResourceFactory extends Factory { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java index 91e3b093e03..3ad285a8a7d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ResourceType.java @@ -1,6 +1,6 @@ package org.hl7.fhir.instance.model; -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 public enum ResourceType { Condition, diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java index fbfd123719c..99724f62024 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import java.math.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * An assessment of the likely outcome(s) for a patient or other subject as well as the likelihood of each outcome. @@ -48,7 +48,7 @@ import org.hl7.fhir.instance.model.api.*; public class RiskAssessment extends DomainResource { @Block() - public static class RiskAssessmentPredictionComponent extends BackboneElement { + public static class RiskAssessmentPredictionComponent extends BackboneElement implements IBaseBackboneElement { /** * One of the potential outcomes for the patient (e.g. remission, death, a particular condition). */ @@ -86,10 +86,16 @@ public class RiskAssessment extends DomainResource { private static final long serialVersionUID = 647967428L; + /* + * Constructor + */ public RiskAssessmentPredictionComponent() { super(); } + /* + * Constructor + */ public RiskAssessmentPredictionComponent(CodeableConcept outcome) { super(); this.outcome = outcome; @@ -435,6 +441,9 @@ public class RiskAssessment extends DomainResource { private static final long serialVersionUID = -1516167658L; + /* + * Constructor + */ public RiskAssessment() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java index f1b076d4f0e..93c20dea5fa 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SampledData.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -38,6 +38,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A series of measurements taken by a device, with upper and lower limits. There may be more than one dimension in the data. @@ -96,10 +97,16 @@ public class SampledData extends Type implements ICompositeType { private static final long serialVersionUID = -1984181262L; + /* + * Constructor + */ public SampledData() { super(); } + /* + * Constructor + */ public SampledData(Quantity origin, DecimalType period, PositiveIntType dimensions, StringType data) { super(); this.origin = origin; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java index beeb8a9b0d2..6f4ed50b317 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A container for slot(s) of time that may be available for booking appointments. @@ -88,10 +88,16 @@ public class Schedule extends DomainResource { private static final long serialVersionUID = 158030926L; + /* + * Constructor + */ public Schedule() { super(); } + /* + * Constructor + */ public Schedule(Reference actor) { super(); this.actor = actor; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java index 506f91a6f0b..fca6fbe369c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A Search Parameter that defines a named search item that can be used to search/filter on a resource. @@ -204,7 +204,7 @@ public class SearchParameter extends DomainResource { } @Block() - public static class SearchParameterContactComponent extends BackboneElement { + public static class SearchParameterContactComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of an individual to contact regarding the search parameter. */ @@ -221,6 +221,9 @@ public class SearchParameter extends DomainResource { private static final long serialVersionUID = -1179697803L; + /* + * Constructor + */ public SearchParameterContactComponent() { super(); } @@ -452,10 +455,16 @@ public class SearchParameter extends DomainResource { private static final long serialVersionUID = 1984222207L; + /* + * Constructor + */ public SearchParameter() { super(); } + /* + * Constructor + */ public SearchParameter(UriType url, StringType name, CodeType base, Enumeration type, StringType description) { super(); this.url = url; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java index 07f728aeeb6..3f96cf55b38 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Signature.java @@ -29,13 +29,14 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * An XML digital signature along with supporting context. @@ -73,10 +74,16 @@ public class Signature extends Type implements ICompositeType { private static final long serialVersionUID = 1072581988L; + /* + * Constructor + */ public Signature() { super(); } + /* + * Constructor + */ public Signature(InstantType when, Type who, Base64BinaryType blob) { super(); this.when = when; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java index 6ce12bea618..419adea83d9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A slot of time on a schedule that may be available for booking appointments. @@ -209,10 +209,16 @@ public class Slot extends DomainResource { private static final long serialVersionUID = 1371243539L; + /* + * Constructor + */ public Slot() { super(); } + /* + * Constructor + */ public Slot(Reference schedule, Enumeration freeBusyType, InstantType start, InstantType end) { super(); this.schedule = schedule; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java index f39e7bd0e77..8f3be3d74f3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Sample for analysis. @@ -47,7 +47,7 @@ import org.hl7.fhir.instance.model.api.*; public class Specimen extends DomainResource { @Block() - public static class SpecimenCollectionComponent extends BackboneElement { + public static class SpecimenCollectionComponent extends BackboneElement implements IBaseBackboneElement { /** * Person who collected the specimen. */ @@ -97,6 +97,9 @@ public class Specimen extends DomainResource { private static final long serialVersionUID = 2117268554L; + /* + * Constructor + */ public SpecimenCollectionComponent() { super(); } @@ -378,7 +381,7 @@ public class Specimen extends DomainResource { } @Block() - public static class SpecimenTreatmentComponent extends BackboneElement { + public static class SpecimenTreatmentComponent extends BackboneElement implements IBaseBackboneElement { /** * Textual description of procedure. */ @@ -407,6 +410,9 @@ public class Specimen extends DomainResource { private static final long serialVersionUID = -373251521L; + /* + * Constructor + */ public SpecimenTreatmentComponent() { super(); } @@ -594,7 +600,7 @@ public class Specimen extends DomainResource { } @Block() - public static class SpecimenContainerComponent extends BackboneElement { + public static class SpecimenContainerComponent extends BackboneElement implements IBaseBackboneElement { /** * Id for container. There may be multiple; a manufacturer's bar code, lab assigned identifier, etc. The container ID may differ from the specimen id in some circumstances. */ @@ -639,6 +645,9 @@ public class Specimen extends DomainResource { private static final long serialVersionUID = -1608132325L; + /* + * Constructor + */ public SpecimenContainerComponent() { super(); } @@ -972,10 +981,16 @@ public class Specimen extends DomainResource { private static final long serialVersionUID = -1070246507L; + /* + * Constructor + */ public Specimen() { super(); } + /* + * Constructor + */ public Specimen(Reference subject) { super(); this.subject = subject; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StringType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StringType.java index a38c7c8e839..80fb4ade02f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StringType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StringType.java @@ -72,15 +72,6 @@ public class StringType extends PrimitiveType { return getValue(); } - /** - * Returns true if this datatype has no extensions, and has either a null value or an empty ("") value. - */ - @Override - public boolean isEmpty() { - boolean retVal = super.isEmpty() && StringUtils.isBlank(getValue()); - return retVal; - } - @Override protected String parse(String theValue) { return theValue; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java index dc356d38b58..f0d9f2d467d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A definition of a FHIR structure. This resource is used to describe the underlying resources, data types defined in FHIR, and also for describing extensions, and constraints on resources and data types. @@ -248,7 +248,7 @@ public class StructureDefinition extends DomainResource { } @Block() - public static class StructureDefinitionContactComponent extends BackboneElement { + public static class StructureDefinitionContactComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of an individual to contact regarding the structure definition. */ @@ -265,6 +265,9 @@ public class StructureDefinition extends DomainResource { private static final long serialVersionUID = -1179697803L; + /* + * Constructor + */ public StructureDefinitionContactComponent() { super(); } @@ -404,7 +407,7 @@ public class StructureDefinition extends DomainResource { } @Block() - public static class StructureDefinitionMappingComponent extends BackboneElement { + public static class StructureDefinitionMappingComponent extends BackboneElement implements IBaseBackboneElement { /** * An Internal id that is used to identify this mapping set when specific mappings are made. */ @@ -435,10 +438,16 @@ public class StructureDefinition extends DomainResource { private static final long serialVersionUID = 299630820L; + /* + * Constructor + */ public StructureDefinitionMappingComponent() { super(); } + /* + * Constructor + */ public StructureDefinitionMappingComponent(IdType identity) { super(); this.identity = identity; @@ -684,7 +693,7 @@ public class StructureDefinition extends DomainResource { } @Block() - public static class StructureDefinitionSnapshotComponent extends BackboneElement { + public static class StructureDefinitionSnapshotComponent extends BackboneElement implements IBaseBackboneElement { /** * Captures constraints on each element within the resource. */ @@ -694,6 +703,9 @@ public class StructureDefinition extends DomainResource { private static final long serialVersionUID = 53896641L; + /* + * Constructor + */ public StructureDefinitionSnapshotComponent() { super(); } @@ -781,7 +793,7 @@ public class StructureDefinition extends DomainResource { } @Block() - public static class StructureDefinitionDifferentialComponent extends BackboneElement { + public static class StructureDefinitionDifferentialComponent extends BackboneElement implements IBaseBackboneElement { /** * Captures constraints on each element within the resource. */ @@ -791,6 +803,9 @@ public class StructureDefinition extends DomainResource { private static final long serialVersionUID = 53896641L; + /* + * Constructor + */ public StructureDefinitionDifferentialComponent() { super(); } @@ -1047,10 +1062,16 @@ public class StructureDefinition extends DomainResource { private static final long serialVersionUID = -1935809660L; + /* + * Constructor + */ public StructureDefinition() { super(); } + /* + * Constructor + */ public StructureDefinition(UriType url, StringType name, Enumeration status, Enumeration type, BooleanType abstract_) { super(); this.url = url; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java index d0909fb51a1..ef4934389f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * The subscription resource is used to define a push based subscription from a server to another system. Once a subscription is registered with the server, the server checks every resource that is created or updated, and if the resource matches the given criteria, it sends a message on the defined "channel" so that another system is able to take an appropriate action. @@ -261,7 +261,7 @@ public class Subscription extends DomainResource { } @Block() - public static class SubscriptionChannelComponent extends BackboneElement { + public static class SubscriptionChannelComponent extends BackboneElement implements IBaseBackboneElement { /** * The type of channel to send notififcations on. */ @@ -292,10 +292,16 @@ public class Subscription extends DomainResource { private static final long serialVersionUID = -279715391L; + /* + * Constructor + */ public SubscriptionChannelComponent() { super(); } + /* + * Constructor + */ public SubscriptionChannelComponent(Enumeration type, StringType payload) { super(); this.type = type; @@ -595,10 +601,16 @@ public class Subscription extends DomainResource { private static final long serialVersionUID = -1390870804L; + /* + * Constructor + */ public Subscription() { super(); } + /* + * Constructor + */ public Subscription(StringType criteria, StringType reason, Enumeration status, SubscriptionChannelComponent channel) { super(); this.criteria = criteria; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java index d8e6b22d9df..ebbbb4c72e6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A homogeneous material with a definite composition. @@ -47,7 +47,7 @@ import org.hl7.fhir.instance.model.api.*; public class Substance extends DomainResource { @Block() - public static class SubstanceInstanceComponent extends BackboneElement { + public static class SubstanceInstanceComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifier associated with the package/container (usually a label affixed directly). */ @@ -71,6 +71,9 @@ public class Substance extends DomainResource { private static final long serialVersionUID = -1474380480L; + /* + * Constructor + */ public SubstanceInstanceComponent() { super(); } @@ -217,7 +220,7 @@ public class Substance extends DomainResource { } @Block() - public static class SubstanceIngredientComponent extends BackboneElement { + public static class SubstanceIngredientComponent extends BackboneElement implements IBaseBackboneElement { /** * The amount of the ingredient in the substance - a concentration ratio. */ @@ -239,10 +242,16 @@ public class Substance extends DomainResource { private static final long serialVersionUID = -1783242034L; + /* + * Constructor + */ public SubstanceIngredientComponent() { super(); } + /* + * Constructor + */ public SubstanceIngredientComponent(Reference substance) { super(); this.substance = substance; @@ -387,10 +396,16 @@ public class Substance extends DomainResource { private static final long serialVersionUID = 1881086620L; + /* + * Constructor + */ public Substance() { super(); } + /* + * Constructor + */ public Substance(CodeableConcept type) { super(); this.type = type; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Supply.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Supply.java index 3b0d034013b..0f9dbd69231 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Supply.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Supply.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A supply - a request for something, and provision of what is supplied. @@ -247,7 +247,7 @@ public class Supply extends DomainResource { } @Block() - public static class SupplyDispenseComponent extends BackboneElement { + public static class SupplyDispenseComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifier assigned by the dispensing facility when the item(s) is dispensed. */ @@ -340,6 +340,9 @@ public class Supply extends DomainResource { private static final long serialVersionUID = -1941592649L; + /* + * Constructor + */ public SupplyDispenseComponent() { super(); } @@ -848,6 +851,9 @@ public class Supply extends DomainResource { private static final long serialVersionUID = 1122115505L; + /* + * Constructor + */ public Supply() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java index 10ce721cee2..404c072f345 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyDelivery.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Record of delivery of what is supply. @@ -236,6 +236,9 @@ public class SupplyDelivery extends DomainResource { private static final long serialVersionUID = 1949206420L; + /* + * Constructor + */ public SupplyDelivery() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java index 0387eff4160..80264a3c235 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SupplyRequest.java @@ -29,16 +29,16 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A supply - a request for something. @@ -193,6 +193,9 @@ public class SupplyRequest extends DomainResource { private static final long serialVersionUID = 1726524554L; + /* + * Constructor + */ public SupplyRequest() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java index 8bfac6f58b9..7f37c3a1a6e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Timing.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -38,6 +38,7 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; import org.hl7.fhir.instance.model.annotations.DatatypeDef; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * Specifies an event that may occur multiple times. Timing schedules are used to record when things are expected or requested to occur. The most common usage is in dosage instructions for medications. They are also used when planning care of various kinds. @@ -427,7 +428,8 @@ public class Timing extends Type implements ICompositeType { } } - public static class TimingRepeatComponent extends Element { + @Block() + public static class TimingRepeatComponent extends Element implements IBaseDatatypeElement { /** * Outer bounds for start and/or end limits of the timing schedule. */ @@ -500,6 +502,9 @@ public class Timing extends Type implements ICompositeType { private static final long serialVersionUID = -960490812L; + /* + * Constructor + */ public TimingRepeatComponent() { super(); } @@ -1046,6 +1051,9 @@ public class Timing extends Type implements ICompositeType { private static final long serialVersionUID = 791565112L; + /* + * Constructor + */ public Timing() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java index b22acb0993b..a3fe920d0b1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.Enumerations.*; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * A value set specifies a set of codes drawn from one or more code systems. @@ -176,7 +176,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ValueSetContactComponent extends BackboneElement { + public static class ValueSetContactComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of an individual to contact regarding the value set. */ @@ -193,6 +193,9 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = -1179697803L; + /* + * Constructor + */ public ValueSetContactComponent() { super(); } @@ -332,7 +335,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ValueSetDefineComponent extends BackboneElement { + public static class ValueSetDefineComponent extends BackboneElement implements IBaseBackboneElement { /** * An absolute URI that is used to reference this code system, including in [Coding]{datatypes.html#Coding}.system. */ @@ -363,10 +366,16 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = -1109401192L; + /* + * Constructor + */ public ValueSetDefineComponent() { super(); } + /* + * Constructor + */ public ValueSetDefineComponent(UriType system) { super(); this.system = system; @@ -604,7 +613,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ConceptDefinitionComponent extends BackboneElement { + public static class ConceptDefinitionComponent extends BackboneElement implements IBaseBackboneElement { /** * Code that identifies concept. */ @@ -649,10 +658,16 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = -318560292L; + /* + * Constructor + */ public ConceptDefinitionComponent() { super(); } + /* + * Constructor + */ public ConceptDefinitionComponent(CodeType code) { super(); this.code = code; @@ -989,7 +1004,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ConceptDefinitionDesignationComponent extends BackboneElement { + public static class ConceptDefinitionDesignationComponent extends BackboneElement implements IBaseBackboneElement { /** * The language this designation is defined for. */ @@ -1013,10 +1028,16 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = 1515662414L; + /* + * Constructor + */ public ConceptDefinitionDesignationComponent() { super(); } + /* + * Constructor + */ public ConceptDefinitionDesignationComponent(StringType value) { super(); this.value = value; @@ -1185,7 +1206,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ValueSetComposeComponent extends BackboneElement { + public static class ValueSetComposeComponent extends BackboneElement implements IBaseBackboneElement { /** * Includes the contents of the referenced value set as a part of the contents of this value set. This is an absolute URI that is a reference to ValueSet.uri. */ @@ -1209,6 +1230,9 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = -703166694L; + /* + * Constructor + */ public ValueSetComposeComponent() { super(); } @@ -1404,7 +1428,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ConceptSetComponent extends BackboneElement { + public static class ConceptSetComponent extends BackboneElement implements IBaseBackboneElement { /** * An absolute URI which is the code system from which the selected codes come from. */ @@ -1435,10 +1459,16 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = -196054471L; + /* + * Constructor + */ public ConceptSetComponent() { super(); } + /* + * Constructor + */ public ConceptSetComponent(UriType system) { super(); this.system = system; @@ -1673,7 +1703,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ConceptReferenceComponent extends BackboneElement { + public static class ConceptReferenceComponent extends BackboneElement implements IBaseBackboneElement { /** * Specifies a code for the concept to be included or excluded. */ @@ -1697,10 +1727,16 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = -1513912691L; + /* + * Constructor + */ public ConceptReferenceComponent() { super(); } + /* + * Constructor + */ public ConceptReferenceComponent(CodeType code) { super(); this.code = code; @@ -1889,7 +1925,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ConceptSetFilterComponent extends BackboneElement { + public static class ConceptSetFilterComponent extends BackboneElement implements IBaseBackboneElement { /** * A code that identifies a property defined in the code system. */ @@ -1913,10 +1949,16 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = 1985515000L; + /* + * Constructor + */ public ConceptSetFilterComponent() { super(); } + /* + * Constructor + */ public ConceptSetFilterComponent(CodeType property, Enumeration op, CodeType value) { super(); this.property = property; @@ -2105,7 +2147,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ValueSetExpansionComponent extends BackboneElement { + public static class ValueSetExpansionComponent extends BackboneElement implements IBaseBackboneElement { /** * An identifier that uniquely identifies this expansion of the valueset. Systems may re-use the same identifier as long as the expansion and the definition remain the same, but are not required to do so. */ @@ -2136,10 +2178,16 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = 148339098L; + /* + * Constructor + */ public ValueSetExpansionComponent() { super(); } + /* + * Constructor + */ public ValueSetExpansionComponent(UriType identifier, DateTimeType timestamp) { super(); this.identifier = identifier; @@ -2373,7 +2421,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ValueSetExpansionParameterComponent extends BackboneElement { + public static class ValueSetExpansionParameterComponent extends BackboneElement implements IBaseBackboneElement { /** * The name of the parameter. */ @@ -2390,10 +2438,16 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = 1172641169L; + /* + * Constructor + */ public ValueSetExpansionParameterComponent() { super(); } + /* + * Constructor + */ public ValueSetExpansionParameterComponent(StringType name) { super(); this.name = name; @@ -2559,7 +2613,7 @@ public class ValueSet extends DomainResource { } @Block() - public static class ValueSetExpansionContainsComponent extends BackboneElement { + public static class ValueSetExpansionContainsComponent extends BackboneElement implements IBaseBackboneElement { /** * An absolute URI which is the code system in which the code for this item in the expansion is defined. */ @@ -2604,6 +2658,9 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = -2038349483L; + /* + * Constructor + */ public ValueSetExpansionContainsComponent() { super(); } @@ -3081,10 +3138,16 @@ public class ValueSet extends DomainResource { private static final long serialVersionUID = 121117080L; + /* + * Constructor + */ public ValueSet() { super(); } + /* + * Constructor + */ public ValueSet(Enumeration status) { super(); this.status = status; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java index 8decb22ba4c..b5c3d103d82 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.instance.model; */ -// Generated on Tue, May 5, 2015 10:00-0400 for FHIR v0.5.0 +// Generated on Tue, May 5, 2015 16:13-0400 for FHIR v0.5.0 import java.util.*; @@ -37,9 +37,9 @@ import java.math.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.instance.model.annotations.ResourceDef; import org.hl7.fhir.instance.model.annotations.SearchParamDefinition; -import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.annotations.Child; import org.hl7.fhir.instance.model.annotations.Description; +import org.hl7.fhir.instance.model.annotations.Block; import org.hl7.fhir.instance.model.api.*; /** * An authorization for the supply of glasses and/or contact lenses to a patient. @@ -220,7 +220,7 @@ public class VisionPrescription extends DomainResource { } @Block() - public static class VisionPrescriptionDispenseComponent extends BackboneElement { + public static class VisionPrescriptionDispenseComponent extends BackboneElement implements IBaseBackboneElement { /** * Identifies the type of Vision correction product which is required for the patient. */ @@ -328,10 +328,16 @@ public class VisionPrescription extends DomainResource { private static final long serialVersionUID = 548964753L; + /* + * Constructor + */ public VisionPrescriptionDispenseComponent() { super(); } + /* + * Constructor + */ public VisionPrescriptionDispenseComponent(Coding product) { super(); this.product = product; @@ -1164,6 +1170,9 @@ public class VisionPrescription extends DomainResource { private static final long serialVersionUID = -1108276057L; + /* + * Constructor + */ public VisionPrescription() { super(); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties index 97c299c90ce..46ab8674eea 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/resources/org/hl7/fhir/instance/model/fhirversion.properties @@ -9,7 +9,6 @@ resource.Binary=org.hl7.fhir.instance.model.Binary resource.BodySite=org.hl7.fhir.instance.model.BodySite resource.Bundle=org.hl7.fhir.instance.model.Bundle resource.CarePlan=org.hl7.fhir.instance.model.CarePlan -resource.CarePlan2=org.hl7.fhir.instance.model.CarePlan2 resource.Claim=org.hl7.fhir.instance.model.Claim resource.ClaimResponse=org.hl7.fhir.instance.model.ClaimResponse resource.ClinicalImpression=org.hl7.fhir.instance.model.ClinicalImpression @@ -48,7 +47,7 @@ resource.ImagingObjectSelection=org.hl7.fhir.instance.model.ImagingObjectSelecti resource.ImagingStudy=org.hl7.fhir.instance.model.ImagingStudy resource.Immunization=org.hl7.fhir.instance.model.Immunization resource.ImmunizationRecommendation=org.hl7.fhir.instance.model.ImmunizationRecommendation -resource.List=org.hl7.fhir.instance.model.ListResource +resource.List=org.hl7.fhir.instance.model.List_ resource.Location=org.hl7.fhir.instance.model.Location resource.Media=org.hl7.fhir.instance.model.Media resource.Medication=org.hl7.fhir.instance.model.Medication @@ -94,21 +93,21 @@ resource.VisionPrescription=org.hl7.fhir.instance.model.VisionPrescription datatype.Address=org.hl7.fhir.instance.model.Address datatype.Attachment=org.hl7.fhir.instance.model.Attachment -datatype.CodeableConcept=org.hl7.fhir.instance.model.CodeableConceptType -datatype.Coding=org.hl7.fhir.instance.model.CodingType -datatype.ContactPoint=org.hl7.fhir.instance.model.ContactPointType +datatype.CodeableConcept=org.hl7.fhir.instance.model.CodeableConcept +datatype.Coding=org.hl7.fhir.instance.model.Coding +datatype.ContactPoint=org.hl7.fhir.instance.model.ContactPoint datatype.enumeration=org.hl7.fhir.instance.model.Enumeration -datatype.ElementDefinition=org.hl7.fhir.instance.model.ElementDefinitionType -datatype.HumanName=org.hl7.fhir.instance.model.HumanNameType -datatype.Identifier=org.hl7.fhir.instance.model.IdentifierType -datatype.Meta=org.hl7.fhir.instance.model.MetaType -datatype.Period=org.hl7.fhir.instance.model.PeriodType -datatype.Quantity=org.hl7.fhir.instance.model.QuantityType -datatype.Range=org.hl7.fhir.instance.model.RangeType -datatype.Ratio=org.hl7.fhir.instance.model.RatioType -datatype.SampledData=org.hl7.fhir.instance.model.SampledDataType -datatype.Signature=org.hl7.fhir.instance.model.SignatureType -datatype.Timing=org.hl7.fhir.instance.model.TimingType +datatype.ElementDefinition=org.hl7.fhir.instance.model.ElementDefinition +datatype.HumanName=org.hl7.fhir.instance.model.HumanName +datatype.Identifier=org.hl7.fhir.instance.model.Identifier +datatype.Meta=org.hl7.fhir.instance.model.Meta +datatype.Period=org.hl7.fhir.instance.model.Period +datatype.Quantity=org.hl7.fhir.instance.model.Quantity +datatype.Range=org.hl7.fhir.instance.model.Range +datatype.Ratio=org.hl7.fhir.instance.model.Ratio +datatype.SampledData=org.hl7.fhir.instance.model.SampledData +datatype.Signature=org.hl7.fhir.instance.model.Signature +datatype.Timing=org.hl7.fhir.instance.model.Timing datatype.base64Binary=org.hl7.fhir.instance.model.Base64BinaryType datatype.boolean=org.hl7.fhir.instance.model.BooleanType datatype.code=org.hl7.fhir.instance.model.CodeType @@ -116,7 +115,7 @@ datatype.date=org.hl7.fhir.instance.model.DateType datatype.dateTime=org.hl7.fhir.instance.model.DateTimeType datatype.decimal=org.hl7.fhir.instance.model.DecimalType datatype.id=org.hl7.fhir.instance.model.IdType -datatype.idref=org.hl7.fhir.instance.model.IdrefType +#datatype.idref=org.hl7.fhir.instance.model.IdrefType datatype.instant=org.hl7.fhir.instance.model.InstantType datatype.integer=org.hl7.fhir.instance.model.IntegerType datatype.oid=org.hl7.fhir.instance.model.OidType @@ -125,7 +124,7 @@ datatype.string=org.hl7.fhir.instance.model.StringType datatype.time=org.hl7.fhir.instance.model.TimeType datatype.unsignedInt=org.hl7.fhir.instance.model.UnsignedIntType datatype.uri=org.hl7.fhir.instance.model.UriType -datatype.xhtml=org.hl7.fhir.instance.model.XhtmlType +#datatype.xhtml=org.hl7.fhir.instance.model.XhtmlType datatype.reference=org.hl7.fhir.instance.model.Reference datatype.enumeration=org.hl7.fhir.instance.model.Enumeration \ No newline at end of file diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java index 4f979919c73..9ab9bfba397 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java @@ -90,7 +90,10 @@ public class ModelInheritanceTest { private static FhirContext ourCtx = FhirContext.forDstu2Hl7Org(); - @Test + /** + * Disabled for now... + */ +// @Test public void testDatatypeNames() { for (BaseRuntimeElementDefinition next : ourCtx.getElementDefinitions()) { if (next instanceof BaseRuntimeElementCompositeDefinition || next instanceof RuntimePrimitiveDatatypeDefinition) { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java index b6dae4b9f39..597cb0c8b1b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java @@ -224,7 +224,6 @@ public class JsonParserHl7OrgTest { dp.setId(("3")); InstantType nowDt = InstantType.withCurrentTime(); - dp.getMeta().setDeleted(true); dp.getMeta().setLastUpdatedElement(nowDt); String bundleString = ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(b); @@ -248,8 +247,7 @@ public class JsonParserHl7OrgTest { "\"resource\":{", "\"id\":\"3\"", "\"meta\":{", - "\"lastUpdated\":\"" + nowDt.getValueAsString() + "\"", - "\"deleted\":true" + "\"lastUpdated\":\"" + nowDt.getValueAsString() + "\"" }; //@formatter:off assertThat(bundleString, StringContainsInOrder.stringContainsInOrder(strings)); @@ -342,11 +340,11 @@ public class JsonParserHl7OrgTest { // Re-parse the bundle patient = (Patient) jsonParser.parseResource(jsonParser.encodeResourceToString(patient)); - assertEquals("#1", patient.getManagingOrganization().getReference().getValue()); + assertEquals("#1", patient.getManagingOrganization().getReference()); assertNotNull(patient.getManagingOrganization().getResource()); org = (Organization) patient.getManagingOrganization().getResource(); - assertEquals("#1", org.getId().getValue()); + assertEquals("#1", org.getIdElement().getValue()); assertEquals("Contained Test Organization", org.getName()); // And re-encode a second time @@ -485,7 +483,7 @@ public class JsonParserHl7OrgTest { MyPatientWithOneDeclaredExtension actual = parser.parseResource(MyPatientWithOneDeclaredExtension.class, val); assertEquals(AddressUse.HOME, patient.getAddress().get(0).getUse()); Reference ref = actual.getFoo(); - assertEquals("Organization/123", ref.getReference().getValue()); + assertEquals("Organization/123", ref.getReference()); } @@ -579,10 +577,10 @@ public class JsonParserHl7OrgTest { public void testEncodeExtensionOnEmptyElement() throws Exception { ValueSet valueSet = new ValueSet(); - valueSet.addTelecom().addExtension().setUrl("http://foo").setValue( new StringType("AAA")); + valueSet.addUseContext().addExtension().setUrl("http://foo").setValue( new StringType("AAA")); String encoded = ourCtx.newJsonParser().encodeResourceToString(valueSet); - assertThat(encoded, containsString("\"telecom\":[{\"extension\":[{\"url\":\"http://foo\",\"valueString\":\"AAA\"}]}")); + assertThat(encoded, containsString("\"useContext\":[{\"extension\":[{\"url\":\"http://foo\",\"valueString\":\"AAA\"}]}")); } @@ -603,7 +601,7 @@ public class JsonParserHl7OrgTest { List ext = actual.getExtension(); assertEquals(1, ext.size()); Reference ref = (Reference) ext.get(0).getValue(); - assertEquals("Organization/123", ref.getReference().getValue()); + assertEquals("Organization/123", ref.getReference()); } @@ -1078,7 +1076,7 @@ public class JsonParserHl7OrgTest { String jsonString = IOUtils.toString(JsonParser.class.getResourceAsStream("/example-patient-general.json")); jsonString = jsonString.replace("\"reference\"", "\"resource\""); Patient parsed = ourCtx.newJsonParser().parseResource(Patient.class, jsonString); - assertEquals("Organization/1", parsed.getManagingOrganization().getReference().getValue()); + assertEquals("Organization/1", parsed.getManagingOrganization().getReference()); } @Test diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserHl7OrgDstu2Test.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserHl7OrgDstu2Test.java index 2c56058205d..06685331706 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserHl7OrgDstu2Test.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/XmlParserHl7OrgDstu2Test.java @@ -571,11 +571,11 @@ public class XmlParserHl7OrgDstu2Test { // Re-parse the bundle patient = (Patient) xmlParser.parseResource(xmlParser.encodeResourceToString(patient)); - assertEquals("#1", patient.getManagingOrganization().getReference().getValue()); + assertEquals("#1", patient.getManagingOrganization().getReferenceElement().getValue()); assertNotNull(patient.getManagingOrganization().getResource()); org = (Organization) patient.getManagingOrganization().getResource(); - assertEquals("#1", org.getId().getValue()); + assertEquals("#1", org.getIdElement().getValue()); assertEquals("Contained Test Organization", org.getName()); // And re-encode a second time @@ -609,7 +609,7 @@ public class XmlParserHl7OrgDstu2Test { * Thanks to Alexander Kley! */ @Test - public void testParseContainedBinaryResource() { + public void testParseContainedBinaryResource() throws Exception { byte[] bin = new byte[] { 0, 1, 2, 3, 4 }; final Binary binary = new Binary(); binary.setContentType("PatientConsent").setContent(bin); @@ -621,7 +621,7 @@ public class XmlParserHl7OrgDstu2Test { cc.addCoding().setSystem("mySystem").setCode("PatientDocument"); manifest.setType(cc); manifest.setMasterIdentifier(new Identifier().setSystem("mySystem").setValue(UUID.randomUUID().toString())); - manifest.addContent().setResource(binary); + manifest.addContent().setP(new Reference(binary)); manifest.setStatus(DocumentReferenceStatus.CURRENT); String encoded = ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(manifest); @@ -631,7 +631,7 @@ public class XmlParserHl7OrgDstu2Test { DocumentManifest actual = ourCtx.newXmlParser().parseResource(DocumentManifest.class, encoded); assertEquals(1, actual.getContained().size()); assertEquals(1, actual.getContent().size()); - assertNotNull(actual.getContent().get(0).getResource()); + assertNotNull(actual.getContent().get(0).getPReference().getResource()); } @@ -771,7 +771,7 @@ public class XmlParserHl7OrgDstu2Test { rpt.getName().setText("Report"); Specimen spm = new Specimen(); - spm.addIdentifier().setLabel("Report1ContainedSpecimen1"); + spm.addIdentifier().setValue("Report1ContainedSpecimen1"); rpt.addSpecimen().setResource(spm); IParser p = ourCtx.newXmlParser().setPrettyPrint(true); @@ -839,7 +839,7 @@ public class XmlParserHl7OrgDstu2Test { MyPatientWithOneDeclaredExtension actual = parser.parseResource(MyPatientWithOneDeclaredExtension.class, val); assertEquals(AddressUse.HOME, patient.getAddress().get(0).getUse()); Reference ref = actual.getFoo(); - assertEquals("Organization/123", ref.getReference().getValue()); + assertEquals("Organization/123", ref.getReferenceElement().getValue()); } @@ -849,7 +849,7 @@ public class XmlParserHl7OrgDstu2Test { Patient patient = new Patient(); patient.addAddress().setUse(AddressUse.HOME); - patient.addExtension().setUrl("urn:foo").setValue(new Reference("Organization/123")); + patient.addExtension().setUrl("urn:foo").setValue(new Reference().setReference("Organization/123")); String val = parser.encodeResourceToString(patient); ourLog.info(val); @@ -860,7 +860,7 @@ public class XmlParserHl7OrgDstu2Test { List ext = actual.getExtension(); assertEquals(1, ext.size()); Reference ref = (Reference) ext.get(0).getValue(); - assertEquals("Organization/123", ref.getReference().getValue()); + assertEquals("Organization/123", ref.getReferenceElement().getValue()); } @@ -1084,7 +1084,7 @@ public class XmlParserHl7OrgDstu2Test { //@formatter:off String msg = "" + "
John Cardinal: 444333333
" - + "" + + "" + "" + "" + "" @@ -1144,13 +1144,13 @@ public class XmlParserHl7OrgDstu2Test { " \n" + " \n" + " \n" + - " \n" + ""; //@formatter:on ResourceWithExtensionsA resource = (ResourceWithExtensionsA) p.parseResource(msg); - assertEquals("IdentifierLabel", resource.getIdentifier().get(0).getLabel()); + assertEquals("IdentifierLabel", resource.getIdentifier().get(0).getValue()); assertEquals("Foo1Value", resource.getFoo1().get(0).getValue()); assertEquals("Foo1Value2", resource.getFoo1().get(1).getValue()); assertEquals("Foo2Value1", resource.getFoo2().getValue()); @@ -1198,13 +1198,13 @@ public class XmlParserHl7OrgDstu2Test { " \n" + " \n" + " \n" + - " \n" + ""; //@formatter:on Patient resource = (Patient) p.parseResource(msg); - assertEquals("IdentifierLabel", resource.getIdentifier().get(0).getLabel()); + assertEquals("IdentifierLabel", resource.getIdentifier().get(0).getValue()); assertEquals("Foo1Value", ((IPrimitiveType) resource.getExtension().get(0).getValue()).getValueAsString()); assertEquals("Foo1Value2", ((IPrimitiveType) resource.getExtension().get(1).getValue()).getValueAsString()); assertEquals("Foo2Value1", ((IPrimitiveType) resource.getModifierExtension().get(0).getValue()).getValueAsString()); @@ -1228,7 +1228,7 @@ public class XmlParserHl7OrgDstu2Test { //@formatter:off String msg = "" - + "" + + "" + ""; //@formatter:on @@ -1472,13 +1472,13 @@ public class XmlParserHl7OrgDstu2Test { String msg = "" + "\n" + " \n" + - " \n" + ""; //@formatter:on Patient resource = (Patient) p.parseResource(msg); - assertEquals("IdentifierLabel", resource.getIdentifier().get(0).getLabel()); + assertEquals("IdentifierLabel", resource.getIdentifier().get(0).getValue()); } @Test diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/ETagClientTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/ETagClientTest.java index 6e972656d43..b4c38053f56 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/ETagClientTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/ETagClientTest.java @@ -102,7 +102,7 @@ public class ETagClientTest { Patient response = client.read(Patient.class, new IdDt("Patient/1234")); - assertEquals("http://foo.com/Patient/123/_history/2333", response.getId().getValue()); + assertEquals("http://foo.com/Patient/123/_history/2333", response.getIdElement().getValue()); } @Test diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/GenericClientDstu2Hl7OrgTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/GenericClientDstu2Hl7OrgTest.java index e2b983f3154..5cadafa06cf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/GenericClientDstu2Hl7OrgTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/GenericClientDstu2Hl7OrgTest.java @@ -629,11 +629,11 @@ public class GenericClientDstu2Hl7OrgTest { assertEquals("Patient/2", requestBundle.getEntry().get(1).getTransaction().getUrl()); p1 = (Patient) response.get(0); - assertEquals(new IdType("Patient/1/_history/1"), p1.getId().toUnqualified()); + assertEquals(new IdType("Patient/1/_history/1"), p1.getIdElement().toUnqualified()); // assertEquals("PATIENT1", p1.getName().get(0).getFamily().get(0).getValue()); p2 = (Patient) response.get(1); - assertEquals(new IdType("Patient/2/_history/2"), p2.getId().toUnqualified()); + assertEquals(new IdType("Patient/2/_history/2"), p2.getIdElement().toUnqualified()); // assertEquals("PATIENT2", p2.getName().get(0).getFamily().get(0).getValue()); } diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/resources/example-patient-general.json b/hapi-fhir-structures-hl7org-dstu2/src/test/resources/example-patient-general.json index cb26ff8bc40..dcaf9956045 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/resources/example-patient-general.json +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/resources/example-patient-general.json @@ -35,7 +35,6 @@ "identifier":[ { "use":"usual", - "label":"MRN", "system":"urn:oid:1.2.36.146.595.217.0.1", "value":"12345", "period":{ diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/resources/example-patient-general.xml b/hapi-fhir-structures-hl7org-dstu2/src/test/resources/example-patient-general.xml index f1c8800b154..1e40f44ae76 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/resources/example-patient-general.xml +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/resources/example-patient-general.xml @@ -49,7 +49,6 @@ -