diff --git a/examples/src/main/java/example/GenericClientExample.java b/examples/src/main/java/example/GenericClientExample.java index 1c0b4de6569..135253caf6e 100644 --- a/examples/src/main/java/example/GenericClientExample.java +++ b/examples/src/main/java/example/GenericClientExample.java @@ -74,30 +74,30 @@ public class GenericClientExample { // END SNIPPET: create } { - Patient patient = new Patient(); - // START SNIPPET: createConditional - // One form - MethodOutcome outcome = client.create() - .resource(patient) - .conditionalByUrl("Patient?identifier=system%7C00001") - .execute(); + Patient patient = new Patient(); + // START SNIPPET: createConditional + // One form + MethodOutcome outcome = client.create() + .resource(patient) + .conditionalByUrl("Patient?identifier=system%7C00001") + .execute(); - // Another form - MethodOutcome outcome2 = client.create() - .resource(patient) - .conditional() - .where(Patient.IDENTIFIER.exactly().systemAndIdentifier("system", "00001")) - .execute(); - - // This will return true if the server responded with an HTTP 201 created, - // otherwise it will return null. - Boolean created = outcome.getCreated(); - - // The ID of the created, or the pre-existing resource - IdDt id = outcome.getId(); - // END SNIPPET: createConditional + // Another form + MethodOutcome outcome2 = client.create() + .resource(patient) + .conditional() + .where(Patient.IDENTIFIER.exactly().systemAndIdentifier("system", "00001")) + .execute(); + + // This will return true if the server responded with an HTTP 201 created, + // otherwise it will return null. + Boolean created = outcome.getCreated(); + + // The ID of the created, or the pre-existing resource + IdDt id = outcome.getId(); + // END SNIPPET: createConditional } - { + { // START SNIPPET: update Patient patient = new Patient(); // ..populate the patient object.. @@ -125,21 +125,21 @@ public class GenericClientExample { // END SNIPPET: update } { - Patient patient = new Patient(); - // START SNIPPET: updateConditional - client.update() - .resource(patient) - .conditionalByUrl("Patient?identifier=system%7C00001") - .execute(); - - client.update() - .resource(patient) - .conditional() - .where(Patient.IDENTIFIER.exactly().systemAndIdentifier("system", "00001")) - .execute(); - // END SNIPPET: updateConditional + Patient patient = new Patient(); + // START SNIPPET: updateConditional + client.update() + .resource(patient) + .conditionalByUrl("Patient?identifier=system%7C00001") + .execute(); + + client.update() + .resource(patient) + .conditional() + .where(Patient.IDENTIFIER.exactly().systemAndIdentifier("system", "00001")) + .execute(); + // END SNIPPET: updateConditional } - { + { // START SNIPPET: etagupdate // First, let's retrive the latest version of a resource // from the server @@ -176,26 +176,26 @@ public class GenericClientExample { } { // START SNIPPET: delete - BaseOperationOutcome resp = client.delete().resourceById(new IdDt("Patient", "1234")).execute(); + BaseOperationOutcome resp = client.delete().resourceById(new IdDt("Patient", "1234")).execute(); // outcome may be null if the server didn't return one - if (resp != null) { - OperationOutcome outcome = (OperationOutcome) resp; + if (resp != null) { + OperationOutcome outcome = (OperationOutcome) resp; System.out.println(outcome.getIssueFirstRep().getDetailsElement().getValue()); } // END SNIPPET: delete } - { - // START SNIPPET: deleteConditional - client.delete() - .resourceConditionalByUrl("Patient?identifier=system%7C00001") - .execute(); - - client.delete() - .resourceConditionalByType("Patient") - .where(Patient.IDENTIFIER.exactly().systemAndIdentifier("system", "00001")) - .execute(); - // END SNIPPET: deleteConditional + { + // START SNIPPET: deleteConditional + client.delete() + .resourceConditionalByUrl("Patient?identifier=system%7C00001") + .execute(); + + client.delete() + .resourceConditionalByType("Patient") + .where(Patient.IDENTIFIER.exactly().systemAndIdentifier("system", "00001")) + .execute(); + // END SNIPPET: deleteConditional } { // START SNIPPET: search 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 0b83d3821da..3f459fd3321 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 @@ -49,13 +49,14 @@ import javax.json.stream.JsonGenerator; import javax.json.stream.JsonGeneratorFactory; import javax.json.stream.JsonParsingException; +import ca.uhn.fhir.model.base.composite.BaseCodingDt; +import ca.uhn.fhir.model.primitive.*; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.hl7.fhir.instance.model.IBase; import org.hl7.fhir.instance.model.IBaseResource; import org.hl7.fhir.instance.model.IPrimitiveType; import org.hl7.fhir.instance.model.api.IAnyResource; -import org.hl7.fhir.instance.model.api.IBaseBinary; import org.hl7.fhir.instance.model.api.IBaseBooleanDatatype; import org.hl7.fhir.instance.model.api.IBaseDatatype; import org.hl7.fhir.instance.model.api.IBaseDecimalDatatype; @@ -88,13 +89,12 @@ import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.api.Tag; import ca.uhn.fhir.model.api.TagList; import ca.uhn.fhir.model.api.annotation.Child; -import ca.uhn.fhir.model.base.composite.BaseCodingDt; import ca.uhn.fhir.model.base.composite.BaseContainedDt; import ca.uhn.fhir.model.base.composite.BaseNarrativeDt; import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt; +import ca.uhn.fhir.model.base.resource.BaseBinary; import ca.uhn.fhir.model.primitive.DecimalDt; import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.InstantDt; import ca.uhn.fhir.model.primitive.IntegerDt; import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.model.primitive.XhtmlDt; @@ -102,10 +102,6 @@ import ca.uhn.fhir.narrative.INarrativeGenerator; import ca.uhn.fhir.util.ElementUtil; import ca.uhn.fhir.util.UrlUtil; -/** - * This class is the FHIR JSON parser/encoder. Users should not interact with this - * class directly, but should use {@link FhirContext#newJsonParser()} to get an instance. - */ public class JsonParser extends BaseParser implements IParser { private static final Set BUNDLE_TEXTNODE_CHILDREN_DSTU1; @@ -302,9 +298,9 @@ public class JsonParser extends BaseParser implements IParser { // IResource nextResource = nextEntry.getResource(); } - if (nextEntry.getTransactionMethod().isEmpty() == false || nextEntry.getLinkSearch().isEmpty() == false) { + if (nextEntry.getTransactionOperation().isEmpty() == false || nextEntry.getLinkSearch().isEmpty() == false) { theEventWriter.writeStartObject("transaction"); - writeOptionalTagWithTextNode(theEventWriter, "method", nextEntry.getTransactionMethod().getValue()); + writeOptionalTagWithTextNode(theEventWriter, "operation", nextEntry.getTransactionOperation().getValue()); writeOptionalTagWithTextNode(theEventWriter, "url", nextEntry.getLinkSearch().getValue()); theEventWriter.writeEnd(); } @@ -456,7 +452,7 @@ public class JsonParser extends BaseParser implements IParser { case RESOURCE: IBaseResource resource = (IBaseResource) theNextValue; RuntimeResourceDefinition def = myContext.getResourceDefinition(resource); - encodeResourceToJsonStreamWriter(def, resource, theWriter, theChildName, false); + encodeResourceToJsonStreamWriter(def, resource, theWriter, theChildName, true); break; case UNDECL_EXT: default: @@ -631,12 +627,12 @@ public class JsonParser extends BaseParser implements IParser { } private void encodeResourceToJsonStreamWriter(RuntimeResourceDefinition theResDef, IBaseResource theResource, JsonGenerator theEventWriter, String theObjectNameOrNull, - boolean theContainedResource) throws IOException { + boolean theIsSubElementWithinResource) throws IOException { String resourceId = null; if (theResource instanceof IResource) { IResource res = (IResource) theResource; if (StringUtils.isNotBlank(res.getId().getIdPart())) { - if (theContainedResource) { + if (theIsSubElementWithinResource) { resourceId = res.getId().getIdPart(); } else if (myContext.getVersion().getVersion().isNewerThan(FhirVersionEnum.DSTU1)) { resourceId = res.getId().getIdPart(); @@ -644,17 +640,17 @@ public class JsonParser extends BaseParser implements IParser { } } else if (theResource instanceof IAnyResource) { IAnyResource res = (IAnyResource) theResource; - if (theContainedResource && StringUtils.isNotBlank(res.getId())) { + if (theIsSubElementWithinResource && StringUtils.isNotBlank(res.getId())) { resourceId = res.getId(); } } - encodeResourceToJsonStreamWriter(theResDef, theResource, theEventWriter, theObjectNameOrNull, theContainedResource, resourceId); + encodeResourceToJsonStreamWriter(theResDef, theResource, theEventWriter, theObjectNameOrNull, theIsSubElementWithinResource, resourceId); } private void encodeResourceToJsonStreamWriter(RuntimeResourceDefinition theResDef, IBaseResource theResource, JsonGenerator theEventWriter, String theObjectNameOrNull, - boolean theContainedResource, String theResourceId) throws IOException { - if (!theContainedResource) { + boolean theIsSubElementWithinResource, String theResourceId) throws IOException { + if (!theIsSubElementWithinResource) { super.containResourcesForEncoding(theResource); } @@ -673,64 +669,55 @@ public class JsonParser extends BaseParser implements IParser { if (myContext.getVersion().getVersion().isNewerThan(FhirVersionEnum.DSTU1) && theResource instanceof IResource) { IResource resource = (IResource) theResource; - - InstantDt updated = (InstantDt) resource.getResourceMetadata().get(ResourceMetadataKeyEnum.UPDATED); - IdDt resourceId = resource.getId(); - String versionIdPart = resourceId.getVersionIdPart(); - if (isBlank(versionIdPart)) { - versionIdPart = ResourceMetadataKeyEnum.VERSION.get(resource); - } - List securityLabels = extractMetadataListNotNull(resource, ResourceMetadataKeyEnum.SECURITY_LABELS); - List profiles = extractMetadataListNotNull(resource, ResourceMetadataKeyEnum.PROFILES); - TagList tags = ResourceMetadataKeyEnum.TAG_LIST.get(resource); - if (ElementUtil.isEmpty(versionIdPart, updated, securityLabels, profiles) == false) { + //Object securityLabelRawObj = + List securityLabels = (List) resource.getResourceMetadata().get(ResourceMetadataKeyEnum.SECURITY_LABELS); + if (!ElementUtil.isEmpty(resource.getId().getVersionIdPart(), ResourceMetadataKeyEnum.UPDATED.get(resource)) + || (securityLabels != null && !securityLabels.isEmpty())) { theEventWriter.writeStartObject("meta"); writeOptionalTagWithTextNode(theEventWriter, "versionId", resource.getId().getVersionIdPart()); writeOptionalTagWithTextNode(theEventWriter, "lastUpdated", ResourceMetadataKeyEnum.UPDATED.get(resource)); - - if (profiles != null && profiles.isEmpty()==false) { - theEventWriter.writeStartArray("profile"); - for (IdDt profile : profiles) { - if (profile != null && isNotBlank(profile.getValue())) { - theEventWriter.write(profile.getValue()); - } - } - theEventWriter.writeEnd(); - } - if (securityLabels.isEmpty()==false) { - theEventWriter.writeStartArray("security"); - for (BaseCodingDt securityLabel : securityLabels) { - theEventWriter.writeStartObject(); - BaseRuntimeElementCompositeDefinition def = (BaseRuntimeElementCompositeDefinition) myContext.getElementDefinition(securityLabel.getClass()); - encodeCompositeElementChildrenToStreamWriter(resDef, resource, securityLabel, theEventWriter, def.getChildren(), theContainedResource); - theEventWriter.writeEnd(); + if (securityLabels != null) { + if (!securityLabels.isEmpty()) { + theEventWriter.writeStartArray("security"); + + for (BaseCodingDt securityLabel : securityLabels) { + theEventWriter.writeStartObject(); + + UriDt system = securityLabel.getSystemElement(); + if (system != null && !system.isEmpty()) + writeOptionalTagWithTextNode(theEventWriter, "system", system.getValueAsString()); + + CodeDt code = securityLabel.getCodeElement(); + + if (code != null && !code.isEmpty()) + writeOptionalTagWithTextNode(theEventWriter, "code", code.getValueAsString()); + + StringDt display = securityLabel.getDisplayElement(); + if (display != null && !display.isEmpty()) + writeOptionalTagWithTextNode(theEventWriter, "display", display.getValueAsString()); + + /*todo: handle version + StringDt version = securityLabel.getVersion(); + if (version != null && ! version.isEmpty()) + writeOptionalTagWithTextNode(theEventWriter, "version", version.getValueAsString()); + */ + theEventWriter.writeEnd(); //end the individual security label + } + theEventWriter.writeEnd(); //end security labels array } - theEventWriter.writeEnd(); - } - - if (tags != null && tags.isEmpty()==false) { - theEventWriter.writeStartArray("tag"); - for (Tag tag : tags) { - theEventWriter.writeStartObject(); - writeOptionalTagWithTextNode(theEventWriter, "system", tag.getScheme()); - writeOptionalTagWithTextNode(theEventWriter, "code", tag.getTerm()); - writeOptionalTagWithTextNode(theEventWriter, "display", tag.getLabel()); - theEventWriter.writeEnd(); - } - theEventWriter.writeEnd(); } theEventWriter.writeEnd(); //end meta } } - if (theResource instanceof IBaseBinary) { - IBaseBinary bin = (IBaseBinary) theResource; + if (theResource instanceof BaseBinary) { + BaseBinary bin = (BaseBinary) theResource; theEventWriter.write("contentType", bin.getContentType()); theEventWriter.write("content", bin.getContentAsBase64()); } else { - encodeCompositeElementToStreamWriter(theResDef, theResource, theResource, theEventWriter, resDef, theContainedResource); + encodeCompositeElementToStreamWriter(theResDef, theResource, theResource, theEventWriter, resDef, theIsSubElementWithinResource); } theEventWriter.writeEnd(); 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 7120d35a69c..3cb7ba85279 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 @@ -1674,7 +1674,7 @@ class ParserState { private class SecurityLabelElementStateHapi extends ElementCompositeState { - public SecurityLabelElementStateHapi(ParserState.PreResourceState thePreResourceState,BaseRuntimeElementCompositeDefinition theDef, BaseCodingDt codingDt) { + public SecurityLabelElementStateHapi(ParserState.PreResourceState thePreResourceState, BaseRuntimeElementCompositeDefinition theDef, BaseCodingDt codingDt) { super(thePreResourceState, theDef, codingDt); } @@ -1716,7 +1716,7 @@ class ParserState { securityLabels = new ArrayList(); myMap.put(ResourceMetadataKeyEnum.SECURITY_LABELS, securityLabels); } - BaseCodingDt securityLabel= myContext.getVersion().newCodingDt(); + BaseCodingDt securityLabel = myContext.getVersion().newCodingDt(); BaseRuntimeElementCompositeDefinition codinfDef = (BaseRuntimeElementCompositeDefinition) myContext.getElementDefinition(securityLabel.getClass()); push(new SecurityLabelElementStateHapi(getPreResourceState(), codinfDef, securityLabel)); securityLabels.add(securityLabel); 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 ae735e99d31..eac0a7fd025 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/XmlParser.java @@ -20,17 +20,17 @@ package ca.uhn.fhir.parser; * #L% */ -import static org.apache.commons.lang3.StringUtils.defaultString; -import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.*; import java.io.IOException; import java.io.Reader; import java.io.StringWriter; import java.io.Writer; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.ListIterator; import javax.xml.namespace.QName; import javax.xml.stream.FactoryConfigurationError; @@ -46,12 +46,13 @@ import javax.xml.stream.events.Namespace; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import ca.uhn.fhir.model.base.composite.BaseCodingDt; +import ca.uhn.fhir.model.primitive.*; import org.apache.commons.lang3.StringUtils; import org.hl7.fhir.instance.model.IBase; import org.hl7.fhir.instance.model.IBaseResource; import org.hl7.fhir.instance.model.IPrimitiveType; import org.hl7.fhir.instance.model.api.IAnyResource; -import org.hl7.fhir.instance.model.api.IBaseBinary; import org.hl7.fhir.instance.model.api.IBaseDatatype; import org.hl7.fhir.instance.model.api.IBaseExtension; import org.hl7.fhir.instance.model.api.IBaseHasExtensions; @@ -72,32 +73,25 @@ import ca.uhn.fhir.context.RuntimeChildUndeclaredExtensionDefinition; import ca.uhn.fhir.context.RuntimeResourceDefinition; import ca.uhn.fhir.model.api.Bundle; import ca.uhn.fhir.model.api.BundleEntry; +import ca.uhn.fhir.model.api.ExtensionDt; +import ca.uhn.fhir.model.api.IElement; +import ca.uhn.fhir.model.api.IPrimitiveDatatype; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.api.ISupportsUndeclaredExtensions; import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.api.Tag; import ca.uhn.fhir.model.api.TagList; -import ca.uhn.fhir.model.base.composite.BaseCodingDt; import ca.uhn.fhir.model.base.composite.BaseContainedDt; import ca.uhn.fhir.model.base.composite.BaseNarrativeDt; import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.model.primitive.InstantDt; -import ca.uhn.fhir.model.primitive.StringDt; -import ca.uhn.fhir.model.primitive.XhtmlDt; +import ca.uhn.fhir.model.base.resource.BaseBinary; import ca.uhn.fhir.narrative.INarrativeGenerator; -import ca.uhn.fhir.rest.server.Constants; -import ca.uhn.fhir.util.ElementUtil; +import ca.uhn.fhir.rest.method.BaseMethodBinding; import ca.uhn.fhir.util.NonPrettyPrintWriterWrapper; import ca.uhn.fhir.util.PrettyPrintWriterWrapper; import ca.uhn.fhir.util.XmlUtil; -/** - * This class is the FHIR XML parser/encoder. Users should not interact with this - * class directly, but should use {@link FhirContext#newXmlParser()} to get an instance. - */ public class XmlParser extends BaseParser implements IParser { - static final String ATOM_NS = "http://www.w3.org/2005/Atom"; static final String FHIR_NS = "http://hl7.org/fhir"; static final String OPENSEARCH_NS = "http://a9.com/-/spec/opensearch/1.1/"; @@ -251,12 +245,12 @@ public class XmlParser extends BaseParser implements IParser { writeTagWithTextNode(eventWriter, "title", theBundle.getTitle()); writeTagWithTextNode(eventWriter, "id", theBundle.getBundleId()); - writeAtomLink(eventWriter, Constants.LINK_SELF, theBundle.getLinkSelf()); - writeAtomLink(eventWriter, Constants.LINK_FIRST, theBundle.getLinkFirst()); - writeAtomLink(eventWriter, Constants.LINK_PREVIOUS, theBundle.getLinkPrevious()); - writeAtomLink(eventWriter, Constants.LINK_NEXT, theBundle.getLinkNext()); - writeAtomLink(eventWriter, Constants.LINK_LAST, theBundle.getLinkLast()); - writeAtomLink(eventWriter, Constants.LINK_FHIR_BASE, theBundle.getLinkBase()); + writeAtomLink(eventWriter, "self", theBundle.getLinkSelf()); + writeAtomLink(eventWriter, "first", theBundle.getLinkFirst()); + writeAtomLink(eventWriter, "previous", theBundle.getLinkPrevious()); + writeAtomLink(eventWriter, "next", theBundle.getLinkNext()); + writeAtomLink(eventWriter, "last", theBundle.getLinkLast()); + writeAtomLink(eventWriter, "fhir-base", theBundle.getLinkBase()); if (theBundle.getTotalResults().getValue() != null) { eventWriter.writeStartElement("os", "totalResults", OPENSEARCH_NS); @@ -418,9 +412,9 @@ public class XmlParser extends BaseParser implements IParser { // IResource nextResource = nextEntry.getResource(); } - if (nextEntry.getTransactionMethod().isEmpty() == false || nextEntry.getLinkSearch().isEmpty() == false) { + if (nextEntry.getTransactionOperation().isEmpty() == false || nextEntry.getLinkSearch().isEmpty() == false) { theEventWriter.writeStartElement("transaction"); - writeOptionalTagWithValue(theEventWriter, "method", nextEntry.getTransactionMethod().getValue()); + writeOptionalTagWithValue(theEventWriter, "operation", nextEntry.getTransactionOperation().getValue()); writeOptionalTagWithValue(theEventWriter, "url", nextEntry.getLinkSearch().getValue()); theEventWriter.writeEndElement(); } @@ -442,7 +436,7 @@ public class XmlParser extends BaseParser implements IParser { } private void encodeChildElementToStreamWriter(IBaseResource theResource, XMLStreamWriter theEventWriter, IBase nextValue, String childName, BaseRuntimeElementDefinition childDef, - String theExtensionUrl, boolean theIncludedResource) throws XMLStreamException, DataFormatException { + String theExtensionUrl, boolean theIncludedResource) throws XMLStreamException, DataFormatException { if (nextValue.isEmpty()) { if (childDef.getChildType() == ChildTypeEnum.CONTAINED_RESOURCES && getContainedResources().isEmpty() == false && theIncludedResource == false) { // We still want to go in.. @@ -521,12 +515,12 @@ public class XmlParser extends BaseParser implements IParser { } private void encodeCompositeElementChildrenToStreamWriter(IBaseResource theResource, IBase theElement, XMLStreamWriter theEventWriter, List children, - boolean theIncludedResource) throws XMLStreamException, DataFormatException { + boolean theIncludedResource) throws XMLStreamException, DataFormatException { for (BaseRuntimeChildDefinition nextChild : children) { if (nextChild.getElementName().equals("extension") || nextChild.getElementName().equals("modifierExtension")) { continue; } - + if (nextChild instanceof RuntimeChildNarrativeDefinition && !theIncludedResource) { INarrativeGenerator gen = myContext.getNarrativeGenerator(); if (theResource instanceof IResource) { @@ -581,7 +575,7 @@ public class XmlParser extends BaseParser implements IParser { // This is called for the Query resource in DSTU1 only extensionUrl = ((IBaseExtension) nextValue).getUrl(); encodeChildElementToStreamWriter(theResource, theEventWriter, nextValue, childName, childDef, extensionUrl, theIncludedResource); - + } else if (extensionUrl != null && childName.equals("extension") == false) { RuntimeChildDeclaredExtensionDefinition extDef = (RuntimeChildDeclaredExtensionDefinition) nextChild; if (extDef.isModifier()) { @@ -603,7 +597,7 @@ public class XmlParser extends BaseParser implements IParser { } private void encodeCompositeElementToStreamWriter(IBaseResource theResource, IBase theElement, XMLStreamWriter theEventWriter, BaseRuntimeElementCompositeDefinition theElementDefinition, - boolean theIncludedResource) throws XMLStreamException, DataFormatException { + boolean theIncludedResource) throws XMLStreamException, DataFormatException { encodeExtensionsIfPresent(theResource, theEventWriter, theElement, theIncludedResource); encodeCompositeElementChildrenToStreamWriter(theResource, theElement, theEventWriter, theElementDefinition.getExtensions(), theIncludedResource); encodeCompositeElementChildrenToStreamWriter(theResource, theElement, theEventWriter, theElementDefinition.getChildren(), theIncludedResource); @@ -651,7 +645,7 @@ public class XmlParser extends BaseParser implements IParser { } private void encodeResourceToStreamWriterInDstu2Format(RuntimeResourceDefinition theResDef, IBaseResource theResource, IBase theElement, XMLStreamWriter theEventWriter, - BaseRuntimeElementCompositeDefinition resDef, boolean theIncludedResource) throws XMLStreamException, DataFormatException { + BaseRuntimeElementCompositeDefinition resDef, boolean theIncludedResource) throws XMLStreamException, DataFormatException { /* * DSTU2 requires extensions to come in a specific spot within the encoded content - This is a bit of a messy way to make that happen, but hopefully this won't matter as much once we use the * HL7 structures @@ -739,55 +733,69 @@ public class XmlParser extends BaseParser implements IParser { // HL7.org Structures encodeCompositeElementToStreamWriter(theResource, theResource, theEventWriter, resDef, theContainedResource); + } else { if (myContext.getVersion().getVersion().isNewerThan(FhirVersionEnum.DSTU1)) { // DSTU2+ + IResource resource = (IResource) theResource; writeOptionalTagWithValue(theEventWriter, "id", theResourceId); + InstantDt updated = (InstantDt) resource.getResourceMetadata().get(ResourceMetadataKeyEnum.UPDATED); + //Object securityLabelRawObj = resource.getResourceMetadata().get(ResourceMetadataKeyEnum.SECURITY_LABELS); + List securityLabels = (List) resource.getResourceMetadata().get(ResourceMetadataKeyEnum.SECURITY_LABELS); IdDt resourceId = resource.getId(); - String versionIdPart = resourceId.getVersionIdPart(); - if (isBlank(versionIdPart)) { - versionIdPart = ResourceMetadataKeyEnum.VERSION.get(resource); - } - List securityLabels = extractMetadataListNotNull(resource, ResourceMetadataKeyEnum.SECURITY_LABELS); - List profiles = extractMetadataListNotNull(resource, ResourceMetadataKeyEnum.PROFILES); - TagList tags = ResourceMetadataKeyEnum.TAG_LIST.get(resource); - if (ElementUtil.isEmpty(versionIdPart, updated, securityLabels, profiles) == false) { + if (resourceId != null && isNotBlank(resourceId.getVersionIdPart()) + || (updated != null && !updated.isEmpty()) + || (securityLabels != null && !securityLabels.isEmpty())) { theEventWriter.writeStartElement("meta"); + String versionIdPart = resourceId.getVersionIdPart(); + if (isBlank(versionIdPart)) { + versionIdPart = ResourceMetadataKeyEnum.VERSION.get(resource); + } writeOptionalTagWithValue(theEventWriter, "versionId", versionIdPart); if (updated != null) { writeOptionalTagWithValue(theEventWriter, "lastUpdated", updated.getValueAsString()); } - for (IdDt profile : profiles) { - theEventWriter.writeStartElement("profile"); - theEventWriter.writeAttribute("value", profile.getValue()); - theEventWriter.writeEndElement(); - } - for (BaseCodingDt securityLabel : securityLabels) { - theEventWriter.writeStartElement("security"); - BaseRuntimeElementCompositeDefinition def = (BaseRuntimeElementCompositeDefinition) myContext.getElementDefinition(securityLabel.getClass()); - encodeCompositeElementChildrenToStreamWriter(resource, securityLabel, theEventWriter, def.getChildren(), theContainedResource); - theEventWriter.writeEndElement(); - } - if (tags != null) { - for (Tag tag : tags) { - theEventWriter.writeStartElement("tag"); - writeOptionalTagWithValue(theEventWriter, "system", tag.getScheme()); - writeOptionalTagWithValue(theEventWriter, "code", tag.getTerm()); - writeOptionalTagWithValue(theEventWriter, "display", tag.getLabel()); - theEventWriter.writeEndElement(); + + if (securityLabels != null) { + + if (!securityLabels.isEmpty()) { + + for (BaseCodingDt securityLabel : securityLabels) { + theEventWriter.writeStartElement("security"); + + UriDt system = securityLabel.getSystemElement(); + if (system != null && !system.isEmpty()) + writeOptionalTagWithValue(theEventWriter, "system", system.getValueAsString()); + + CodeDt code = securityLabel.getCodeElement(); + if (code != null && !code.isEmpty()) + writeOptionalTagWithValue(theEventWriter, "code", code.getValueAsString()); + + StringDt display = securityLabel.getDisplayElement(); + if (display != null && !display.isEmpty()) + writeOptionalTagWithValue(theEventWriter, "display", display.getValueAsString()); + + /*todo: handle version + StringDt version = securityLabel.getVersion(); + if (version != null && ! version.isEmpty()) + writeOptionalTagWithValue(theEventWriter, "version", version.getValueAsString()); + */ + theEventWriter.writeEndElement(); + } + } } theEventWriter.writeEndElement(); } - if (theResource instanceof IBaseBinary) { - IBaseBinary bin = (IBaseBinary) theResource; + if (theResource instanceof BaseBinary) { + BaseBinary bin = (BaseBinary) theResource; writeOptionalTagWithValue(theEventWriter, "contentType", bin.getContentType()); writeOptionalTagWithValue(theEventWriter, "content", bin.getContentAsBase64()); } else { @@ -801,8 +809,8 @@ public class XmlParser extends BaseParser implements IParser { theEventWriter.writeAttribute("id", theResourceId); } - if (theResource instanceof IBaseBinary) { - IBaseBinary bin = (IBaseBinary) theResource; + if (theResource instanceof BaseBinary) { + BaseBinary bin = (BaseBinary) theResource; if (bin.getContentType() != null) { theEventWriter.writeAttribute("contentType", bin.getContentType()); } diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java index 63e58755f95..70cf63a0f84 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/MethodOutcome.java @@ -135,7 +135,7 @@ public class MethodOutcome { } /** - * This will be set to {@link Boolean#TRUE} for instance of MethodOutcome which are + * This will be set to {@link Boolean#TRUE} for instance of MethodOutcome which are * returned to client instances, if the server has responded with an HTTP 201 Created. */ public Boolean getCreated() { diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java index 288095ab83a..9ca10643fce 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java @@ -280,9 +280,9 @@ abstract class BaseOutcomeReturningMethodBinding extends BaseMethodBinding + + \ No newline at end of file diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java index 33cab9ca62f..a315308712e 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu2; +import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor; import org.apache.commons.lang3.StringUtils; import org.springframework.context.ApplicationContext; import org.springframework.web.context.ContextLoaderListener; @@ -167,10 +168,15 @@ public class TestRestfulServer extends RestfulServer { * Do some fancy logging to create a nice access log that has details * about each incoming request. */ - LoggingInterceptor loggingInterceptor = new LoggingInterceptor(); + List interceptorBeans = myAppCtx.getBean("myServerInterceptors", List.class); + for (IServerInterceptor interceptor : interceptorBeans) + this.registerInterceptor(interceptor); + + /*LoggingInterceptor loggingInterceptor = new LoggingInterceptor(); loggingInterceptor.setLoggerName("fhirtest.access"); loggingInterceptor.setMessageFormat("Path[${servletPath}] Source[${requestHeader.x-forwarded-for}] Operation[${operationType} ${idOrResourceName}] UA[${requestHeader.user-agent}] Params[${requestParameters}]"); this.registerInterceptor(loggingInterceptor); + */ } diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml index 3922d51ebb8..e99cfbb79ad 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/hapi-fhir-server-config.xml @@ -21,4 +21,13 @@ + + + + + + + + \ No newline at end of file diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java index d35540813f2..92b4226b665 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java @@ -131,7 +131,7 @@ public class GenericClientTest { ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[] { new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22") }); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), Charset.forName("UTF-8"))); @@ -140,14 +140,14 @@ public class GenericClientTest { when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); MethodOutcome resp = client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).execute(); assertTrue(resp.getCreated()); - + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); resp = client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).execute(); assertNull(resp.getCreated()); - + } - - + + @Test public void testCreateWithStringAutoDetectsEncoding() throws Exception { diff --git a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java index 5480b4a40dd..a4210031bb2 100644 --- a/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java +++ b/hapi-fhir-structures-dstu2/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java @@ -105,7 +105,7 @@ public class FhirDstu2 implements IFhirVersion { public Class getContainedType() { return ContainedDt.class; } - + @Override public BaseCodingDt newCodingDt() { return new CodingDt(); diff --git a/src/site/xdoc/doc_rest_client.xml b/src/site/xdoc/doc_rest_client.xml index 8128e6a589f..40e2cb8dc7b 100644 --- a/src/site/xdoc/doc_rest_client.xml +++ b/src/site/xdoc/doc_rest_client.xml @@ -165,8 +165,10 @@

Search - Using HTTP POST

- The FHIR specification allows the use of an HTTP POST to transmit a search to a server instead of using - an HTTP GET. With this style of search, the search parameters are included in the request body instead + The FHIR specification allows the use of an HTTP POST to transmit a search to a server instead of + using + an HTTP GET. With this style of search, the search parameters are included in the request body + instead of the request URL, which can be useful if you need to transmit a search with a large number of parameters.

@@ -176,7 +178,7 @@ case the client automatically switches to POST.

- An alternate form of the search URL (using a URL ending with _search) was also + An alternate form of the search URL (using a URL ending with_search) was also supported in FHIR DSTU1. This form is no longer valid in FHIR DSTU2, but HAPI retains support for using this form in order to interoperate with servers which use it.

@@ -211,18 +213,18 @@ - +

Conditional Creates

FHIR also specifies a type of update called "conditional create", where a set of search parameters are provided and a new resource is only - created if no existing resource matches those parameters. See the - FHIR specification for more information on conditional creation. + created if no existing resource matches those parameters. See the + FHIR specification for more information on conditional creation.

- + + value="examples/src/main/java/example/GenericClientExample.java"/> @@ -276,7 +278,7 @@

Conditional Deletes

- Conditional deletions are also possible, which is a form where + Conditional deletions are also possible, which is a form where instead of deleting a resource using its logical ID, you specify a set of search criteria and a single resource is deleted if it matches that criteria. Note that this is not a mechanism @@ -284,9 +286,9 @@ on conditional deletes and how they are used.

- + + value="examples/src/main/java/example/GenericClientExample.java"/> @@ -305,19 +307,19 @@ - +

Conditional Updates

FHIR also specifies a type of update called "conditional updates", where insetad of using the logical ID of a resource to update, a set of search parameters is provided. If a single resource matches that set of - parameters, that resource is updated. See the FHIR specification for + parameters, that resource is updated. See the FHIR specification for information on how conditional updates work.

- + + value="examples/src/main/java/example/GenericClientExample.java"/>

ETags and Resource Contention