(resourceList), theBundleType, theServerBase, theServer.getBundleInclusionRule(), theIncludes);
addRootPropertiesToBundle(null, theServerBase, theCompleteUrl, theResult.size(), theBundleType);
- myBundle.setPublished(theResult.getPublished());
-
if (theServer.getPagingProvider() != null) {
int limit;
limit = theLimit != null ? theLimit : theServer.getPagingProvider().getDefaultPageSize();
@@ -232,10 +230,6 @@ public class Dstu1BundleFactory implements IVersionSpecificBundleFactory {
myBundle.getBundleId().setValue(UUID.randomUUID().toString());
}
- if (myBundle.getPublished().isEmpty()) {
- myBundle.getPublished().setToCurrentTimeInLocalTimeZone();
- }
-
if (myBundle.getLinkBase().isEmpty()) {
myBundle.getLinkBase().setValue(theServerBase);
}
@@ -269,7 +263,6 @@ public class Dstu1BundleFactory implements IVersionSpecificBundleFactory {
myBundle.getAuthorName().setValue(theAuthor);
myBundle.getBundleId().setValue(UUID.randomUUID().toString());
- myBundle.getPublished().setToCurrentTimeInLocalTimeZone();
myBundle.getLinkBase().setValue(theServerBase);
myBundle.getLinkSelf().setValue(theCompleteUrl);
myBundle.getType().setValueAsEnum(theBundleType);
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
index 6bcdacd5b22..793e80e23bd 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
@@ -30,10 +30,19 @@ import org.apache.commons.lang3.StringUtils;
*/
public class IncomingRequestAddressStrategy implements IServerAddressStrategy {
+ private String myServletPath;
+
@Override
public String determineServerBase(ServletContext theServletContext, HttpServletRequest theRequest) {
String requestFullPath = StringUtils.defaultString(theRequest.getRequestURI());
- String servletPath = StringUtils.defaultString(theRequest.getServletPath());
+
+ String servletPath;
+ if (myServletPath != null) {
+ servletPath = myServletPath;
+ } else {
+ servletPath = StringUtils.defaultString(theRequest.getServletPath());
+ }
+
StringBuffer requestUrl = theRequest.getRequestURL();
String servletContextPath = "";
if (theServletContext != null) {
@@ -48,7 +57,9 @@ public class IncomingRequestAddressStrategy implements IServerAddressStrategy {
}
int startOfPath = requestUrl.indexOf("//");
- if (startOfPath != -1 && (startOfPath + 2) < requestUrl.length()) {
+ int requestUrlLength = requestUrl.length();
+
+ if (startOfPath != -1 && (startOfPath + 2) < requestUrlLength) {
startOfPath = requestUrl.indexOf("/", startOfPath + 2);
}
if (startOfPath == -1) {
@@ -56,9 +67,9 @@ public class IncomingRequestAddressStrategy implements IServerAddressStrategy {
}
int contextIndex;
- if (servletPath.length() == 0) {
+ if (servletPath.length() == 0 || servletPath.equals("/")) {
if (requestPath.length() == 0) {
- contextIndex = requestUrl.length();
+ contextIndex = requestUrlLength;
} else {
contextIndex = requestUrl.indexOf(requestPath, startOfPath);
}
@@ -68,8 +79,30 @@ public class IncomingRequestAddressStrategy implements IServerAddressStrategy {
String fhirServerBase;
int length = contextIndex + servletPath.length();
+ if (length > requestUrlLength) {
+ length = requestUrlLength;
+ }
fhirServerBase = requestUrl.substring(0, length);
return fhirServerBase;
}
+ /**
+ * If set to a non-null value (default is null), this address strategy assumes that the FHIR endpoint is deployed to the given servlet path within the context. This is useful in some
+ * deployments where it isn't obvious to the servlet which part of the path is actually the root path to reach the servlet.
+ *
+ * Example values could be:
+ *
+ * - null
+ * - /
+ * - /base
+ *
+ *
+ *
+ * Wildcards are not supported!
+ *
+ */
+ public void setServletPath(String theServletPath) {
+ myServletPath = theServletPath;
+ }
+
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
index 557a2d10b3e..5580492d90f 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
@@ -490,7 +490,7 @@ public class RestfulServer extends HttpServlet {
return;
}
}
- RestfulServerUtils.streamResponseAsResource(this, theResponse, (IResource) resBundle, responseEncoding, prettyPrint, requestIsBrowser, narrativeMode, Constants.STATUS_HTTP_200_OK, theRequest.isRespondGzip(), theRequest.getFhirServerBase());
+ RestfulServerUtils.streamResponseAsResource(this, theResponse, (IResource) resBundle, responseEncoding, prettyPrint, requestIsBrowser, narrativeMode, Constants.STATUS_HTTP_200_OK, theRequest.isRespondGzip(), theRequest.getFhirServerBase(), false);
}
}
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 26daa5255cd..87df3587f3d 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
@@ -76,10 +76,10 @@ public class RestfulServerUtils {
}
public static void streamResponseAsResource(RestfulServer theServer, HttpServletResponse theHttpResponse, IBaseResource theResource, EncodingEnum theResponseEncoding, boolean thePrettyPrint,
- boolean theRequestIsBrowser, RestfulServer.NarrativeModeEnum theNarrativeMode, int stausCode, boolean theRespondGzip, String theServerBase) throws IOException {
+ boolean theRequestIsBrowser, RestfulServer.NarrativeModeEnum theNarrativeMode, int stausCode, boolean theRespondGzip, String theServerBase, boolean theAddContentLocationHeader) throws IOException {
theHttpResponse.setStatus(stausCode);
- if (theResource.getId() != null && theResource.getId().hasIdPart() && isNotBlank(theServerBase)) {
+ if (theAddContentLocationHeader && theResource.getId() != null && theResource.getId().hasIdPart() && isNotBlank(theServerBase)) {
String resName = theServer.getFhirContext().getResourceDefinition(theResource).getName();
IIdType fullId = theResource.getId().withServerBase(theServerBase, resName);
theHttpResponse.addHeader(Constants.HEADER_CONTENT_LOCATION, fullId.getValue());
@@ -413,12 +413,12 @@ public class RestfulServerUtils {
}
}
- public static void streamResponseAsResource(RestfulServer theServer, HttpServletResponse theHttpResponse, IBaseResource theResource, EncodingEnum theResponseEncoding, boolean thePrettyPrint,
- boolean theRequestIsBrowser, RestfulServer.NarrativeModeEnum theNarrativeMode, boolean theRespondGzip, String theServerBase) throws IOException {
- int stausCode = 200;
- RestfulServerUtils.streamResponseAsResource(theServer, theHttpResponse, theResource, theResponseEncoding, thePrettyPrint, theRequestIsBrowser, theNarrativeMode, stausCode, theRespondGzip,
- theServerBase);
- }
+// public static void streamResponseAsResource(RestfulServer theServer, HttpServletResponse theHttpResponse, IResource theResource, EncodingEnum theResponseEncoding, boolean thePrettyPrint,
+// boolean theRequestIsBrowser, RestfulServer.NarrativeModeEnum theNarrativeMode, boolean theRespondGzip, String theServerBase) throws IOException {
+// int stausCode = 200;
+// RestfulServerUtils.streamResponseAsResource(theServer, theHttpResponse, theResource, theResponseEncoding, thePrettyPrint, theRequestIsBrowser, theNarrativeMode, stausCode, theRespondGzip,
+// theServerBase);
+// }
public static void validateResourceListNotNull(List theResourceList) {
if (theResourceList == null) {
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java
index a8987477d3c..8737104ff11 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java
@@ -129,7 +129,7 @@ public class ExceptionHandlingInterceptor extends InterceptorAdapter {
boolean requestIsBrowser = RestfulServer.requestIsBrowser(theRequest);
String fhirServerBase = ((Request) theRequestDetails).getFhirServerBase();
RestfulServerUtils.streamResponseAsResource(theRequestDetails.getServer(), theResponse, oo, RestfulServerUtils.determineResponseEncodingNoDefault(theRequest), true, requestIsBrowser,
- NarrativeModeEnum.NORMAL, statusCode, false, fhirServerBase);
+ NarrativeModeEnum.NORMAL, statusCode, false, fhirServerBase, false);
// theResponse.setStatus(statusCode);
// theRequestDetails.getServer().addHeadersToResponse(theResponse);
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java.orig b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java.orig
deleted file mode 100644
index 9e81a04ae44..00000000000
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java.orig
+++ /dev/null
@@ -1,172 +0,0 @@
-package ca.uhn.fhir.rest.server.interceptor;
-
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.exception.ExceptionUtils;
-
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.model.base.resource.BaseOperationOutcome;
-import ca.uhn.fhir.model.base.resource.BaseOperationOutcome.BaseIssue;
-import ca.uhn.fhir.rest.method.Request;
-import ca.uhn.fhir.rest.method.RequestDetails;
-import ca.uhn.fhir.rest.server.Constants;
-import ca.uhn.fhir.rest.server.RestfulServer;
-import ca.uhn.fhir.rest.server.RestfulServer.NarrativeModeEnum;
-import ca.uhn.fhir.rest.server.RestfulServerUtils;
-import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
-import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
-
-public class ExceptionHandlingInterceptor extends InterceptorAdapter {
-
- private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExceptionHandlingInterceptor.class);
- private Class[] myReturnStackTracesForExceptionTypes;
-
- /**
- * If any server methods throw an exception which extends any of the given exception types, the exception
- * stack trace will be returned to the user. This can be useful for helping to diagnose issues, but may
- * not be desirable for production situations.
- *
- * @param theExceptionTypes The exception types for which to return the stack trace to the user.
- * @return Returns an instance of this interceptor, to allow for easy method chaining.
- */
- public ExceptionHandlingInterceptor setReturnStackTracesForExceptionTypes(Class... theExceptionTypes) {
- myReturnStackTracesForExceptionTypes = theExceptionTypes;
- return this;
- }
-
- @Override
-<<<<<<< HEAD
- public boolean handleException(RequestDetails theRequestDetails, Throwable theException, HttpServletRequest theRequest, HttpServletResponse theResponse) throws ServletException, IOException {
-=======
- public boolean handleException(RestfulServer theRestfulServer, RequestDetails theRequestDetails, Throwable theException, HttpServletRequest theRequest, HttpServletResponse theResponse) throws ServletException, IOException {
- ourLog.error("AA", theException);
->>>>>>> 5956ab75fd9186ccc8b9836b60bc421b19d3d288
- BaseOperationOutcome oo = null;
- int statusCode = Constants.STATUS_HTTP_500_INTERNAL_ERROR;
-
- FhirContext ctx = theRestfulServer.getFhirContext();
-
- if (theException instanceof BaseServerResponseException) {
- oo = ((BaseServerResponseException) theException).getOperationOutcome();
- statusCode = ((BaseServerResponseException) theException).getStatusCode();
- }
-
- /*
- * Generate an OperationOutcome to return, unless the exception throw by the resource provider had one
- */
- if (oo == null) {
- try {
- oo = (BaseOperationOutcome) ctx.getResourceDefinition("OperationOutcome").getImplementingClass().newInstance();
- } catch (Exception e1) {
- ourLog.error("Failed to instantiate OperationOutcome resource instance", e1);
- throw new ServletException("Failed to instantiate OperationOutcome resource instance", e1);
- }
-
- BaseIssue issue = oo.addIssue();
- issue.getSeverityElement().setValue("error");
- if (theException instanceof InternalErrorException) {
- ourLog.error("Failure during REST processing", theException);
- populateDetails(theException, issue);
- } else if (theException instanceof BaseServerResponseException) {
- ourLog.warn("Failure during REST processing: {}", theException);
- BaseServerResponseException baseServerResponseException = (BaseServerResponseException) theException;
- statusCode = baseServerResponseException.getStatusCode();
- populateDetails(theException, issue);
- if (baseServerResponseException.getAdditionalMessages() != null) {
- for (String next : baseServerResponseException.getAdditionalMessages()) {
- BaseIssue issue2 = oo.addIssue();
- issue2.getSeverityElement().setValue("error");
- issue2.setDetails(next);
- }
- }
- } else {
- ourLog.error("Failure during REST processing: " + theException.toString(), theException);
- populateDetails(theException, issue);
- statusCode = Constants.STATUS_HTTP_500_INTERNAL_ERROR;
- }
- } else {
- ourLog.error("Unknown error during processing", theException);
- }
-
- // Add headers associated with the specific error code
- if (theException instanceof BaseServerResponseException) {
- Map additional = ((BaseServerResponseException) theException).getAssociatedHeaders();
- if (additional != null) {
- for (Entry next : additional.entrySet()) {
- if (isNotBlank(next.getKey()) && next.getValue() != null) {
- String nextKey = next.getKey();
- for (String nextValue : next.getValue()) {
- theResponse.addHeader(nextKey, nextValue);
- }
- }
- }
- }
- }
-
- boolean requestIsBrowser = RestfulServer.requestIsBrowser(theRequest);
- String fhirServerBase = theRestfulServer.getServerBaseForRequest(theRequest);
-
- RestfulServerUtils.streamResponseAsResource(theRestfulServer, theResponse, oo, RestfulServerUtils.determineResponseEncodingNoDefault(theRequest), true, requestIsBrowser,
- NarrativeModeEnum.NORMAL, statusCode, false, fhirServerBase);
-
-<<<<<<< HEAD
-// theResponse.setStatus(statusCode);
-// theRequestDetails.getServer().addHeadersToResponse(theResponse);
-// theResponse.setContentType("text/plain");
-// theResponse.setCharacterEncoding("UTF-8");
-// theResponse.getWriter().append(theException.getMessage());
-// theResponse.getWriter().close();
-=======
- theResponse.setStatus(statusCode);
- theRestfulServer.addHeadersToResponse(theResponse);
- theResponse.setContentType("text/plain");
- theResponse.setCharacterEncoding("UTF-8");
- theResponse.getWriter().append(theException.getMessage());
- theResponse.getWriter().close();
->>>>>>> 5956ab75fd9186ccc8b9836b60bc421b19d3d288
-
- return false;
- }
-
- private void populateDetails(Throwable theException, BaseIssue issue) {
- if (myReturnStackTracesForExceptionTypes != null) {
- for (Class next : myReturnStackTracesForExceptionTypes) {
- if (next.isAssignableFrom(theException.getClass())) {
- issue.getDetailsElement().setValue(theException.getMessage() + "\n\n" + ExceptionUtils.getStackTrace(theException));
- return;
- }
- }
- }
-
- issue.getDetailsElement().setValue(theException.getMessage());
- }
-
-}
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 f3d5a40984c..ee43923212b 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
@@ -61,7 +61,7 @@ public class FhirTerser {
if (theElement instanceof ISupportsUndeclaredExtensions) {
ISupportsUndeclaredExtensions containingElement = (ISupportsUndeclaredExtensions) theElement;
for (ExtensionDt nextExt : containingElement.getUndeclaredExtensions()) {
- theCallback.acceptUndeclaredExtension(containingElement, theChildDefinition, theDefinition, nextExt);
+ theCallback.acceptUndeclaredExtension(containingElement, null, theChildDefinition, theDefinition, nextExt);
addUndeclaredExtensions(nextExt, theDefinition, theChildDefinition, theCallback);
}
}
@@ -90,10 +90,10 @@ public class FhirTerser {
public List getAllPopulatedChildElementsOfType(IBaseResource theResource, final Class theType) {
final ArrayList retVal = new ArrayList();
BaseRuntimeElementCompositeDefinition def = myContext.getResourceDefinition(theResource);
- visit(theResource, null, def, new IModelVisitor() {
+ visit(theResource, null, null, def, new IModelVisitor() {
@SuppressWarnings("unchecked")
@Override
- public void acceptElement(IBase theElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition) {
+ public void acceptElement(IBase theElement, List thePathToElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition) {
if (theElement == null || theElement.isEmpty()) {
return;
}
@@ -105,7 +105,8 @@ public class FhirTerser {
@SuppressWarnings("unchecked")
@Override
- public void acceptUndeclaredExtension(ISupportsUndeclaredExtensions theContainingElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition, ExtensionDt theNextExt) {
+ public void acceptUndeclaredExtension(ISupportsUndeclaredExtensions theContainingElement, List thePathToElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition,
+ ExtensionDt theNextExt) {
if (theType.isAssignableFrom(theNextExt.getClass())) {
retVal.add((T) theNextExt);
}
@@ -117,39 +118,34 @@ public class FhirTerser {
return retVal;
}
- public List getAllResourceReferences(final IBaseResource theResource) {
- final ArrayList retVal = new ArrayList();
- BaseRuntimeElementCompositeDefinition def = myContext.getResourceDefinition(theResource);
- visit(theResource, null, def, new IModelVisitor() {
- @Override
- public void acceptElement(IBase theElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition) {
- if (theElement == null || theElement.isEmpty()) {
- return;
- }
- String name = null;
- if (theChildDefinition != null) {
- name = theChildDefinition.getElementName();
- }
- if (BaseResourceReferenceDt.class.isAssignableFrom(theElement.getClass())) {
- retVal.add(new ResourceReferenceInfo(theResource, name, (BaseResourceReferenceDt) theElement));
- }
- }
+ public List getAllResourceReferences(final IBaseResource theResource) {
+ final ArrayList retVal = new ArrayList();
+ BaseRuntimeElementCompositeDefinition def = myContext.getResourceDefinition(theResource);
+ visit(theResource, null, null, def, new IModelVisitor() {
+ @SuppressWarnings("unchecked")
+ @Override
+ public void acceptElement(IBase theElement, List thePathToElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition) {
+ if (theElement == null || theElement.isEmpty()) {
+ return;
+ }
+ if (BaseResourceReferenceDt.class.isAssignableFrom(theElement.getClass())) {
+ retVal.add(new ResourceReferenceInfo(theResource, thePathToElement, (BaseResourceReferenceDt)theElement));
+ }
+ }
- @Override
- public void acceptUndeclaredExtension(ISupportsUndeclaredExtensions theContainingElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition, ExtensionDt theNextExt) {
- String name = null;
- if (theChildDefinition != null) {
- name = theChildDefinition.getElementName();
- }
- if (theNextExt.getValue() != null && BaseResourceReferenceDt.class.isAssignableFrom(theNextExt.getValue().getClass())) {
- retVal.add(new ResourceReferenceInfo(theResource, name, (BaseResourceReferenceDt) theNextExt.getValue()));
- }
- }
- });
- return retVal;
- }
+ @SuppressWarnings("unchecked")
+ @Override
+ public void acceptUndeclaredExtension(ISupportsUndeclaredExtensions theContainingElement, List thePathToElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition,
+ ExtensionDt theNextExt) {
+ if (theNextExt.getValue() != null && BaseResourceReferenceDt.class.isAssignableFrom(theNextExt.getValue().getClass())) {
+ retVal.add(new ResourceReferenceInfo(theResource, thePathToElement, (BaseResourceReferenceDt)theNextExt.getValue()));
+ }
+ }
+ });
+ return retVal;
+ }
- private BaseRuntimeChildDefinition getDefinition(BaseRuntimeElementCompositeDefinition theCurrentDef, List theSubList) {
+ private BaseRuntimeChildDefinition getDefinition(BaseRuntimeElementCompositeDefinition theCurrentDef, List theSubList) {
BaseRuntimeChildDefinition nextDef = theCurrentDef.getChildByNameOrThrowDataFormatException(theSubList.get(0));
if (theSubList.size() == 1) {
@@ -222,8 +218,19 @@ public class FhirTerser {
}
- private void visit(IBase theElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition, IModelVisitor theCallback) {
- theCallback.acceptElement(theElement, theChildDefinition, theDefinition);
+ private List addNameToList(List theCurrentList, BaseRuntimeChildDefinition theChildDefinition) {
+ if (theChildDefinition == null)
+ return null;
+ if (theCurrentList== null || theCurrentList.isEmpty())
+ return new ArrayList(Arrays.asList(theChildDefinition.getElementName()));
+ List newList = new ArrayList(theCurrentList);
+ newList.add(theChildDefinition.getElementName());
+ return newList;
+ }
+
+ private void visit(IBase theElement, List thePathToElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition, IModelVisitor theCallback) {
+ List pathToElement = addNameToList(thePathToElement, theChildDefinition);
+ theCallback.acceptElement(theElement, pathToElement, theChildDefinition, theDefinition);
addUndeclaredExtensions(theElement, theDefinition, theChildDefinition, theCallback);
// if (theElement.isEmpty()) {
@@ -243,7 +250,7 @@ public class FhirTerser {
IBaseResource theResource = resRefDt.getResource();
if (theResource.getId() == null || theResource.getId().isEmpty() || theResource.getId().isLocal()) {
BaseRuntimeElementCompositeDefinition def = myContext.getResourceDefinition(theResource);
- visit(theResource, null, def, theCallback);
+ visit(theResource, pathToElement, null, def, theCallback);
}
}
break;
@@ -285,9 +292,9 @@ public class FhirTerser {
if (nextChild instanceof RuntimeChildDirectResource) {
// Don't descend into embedded resources
- theCallback.acceptElement(nextValue, nextChild, childElementDef);
+ theCallback.acceptElement(nextValue, null, nextChild, childElementDef);
} else {
- visit(nextValue, nextChild, childElementDef, theCallback);
+ visit(nextValue, pathToElement, nextChild, childElementDef, theCallback);
}
}
}
@@ -298,7 +305,7 @@ public class FhirTerser {
BaseContainedDt value = (BaseContainedDt) theElement;
for (IResource next : value.getContainedResources()) {
BaseRuntimeElementCompositeDefinition def = myContext.getResourceDefinition(next);
- visit(next, null, def, theCallback);
+ visit(next, pathToElement, null, def, theCallback);
}
break;
}
@@ -309,7 +316,7 @@ public class FhirTerser {
case CONTAINED_RESOURCE_LIST:
if (theElement != null) {
BaseRuntimeElementDefinition def = myContext.getElementDefinition(theElement.getClass());
- visit(theElement, null, def, theCallback);
+ visit(theElement, pathToElement, null, def, theCallback);
}
break;
}
@@ -454,7 +461,7 @@ public class FhirTerser {
*/
public void visit(IBaseResource theResource, IModelVisitor theVisitor) {
BaseRuntimeElementCompositeDefinition def = myContext.getResourceDefinition(theResource);
- visit(theResource, null, def, theVisitor);
+ visit(theResource, null, null, def, theVisitor);
}
/**
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor.java
index f183f8ee4d4..518080aab93 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/IModelVisitor.java
@@ -28,6 +28,8 @@ import ca.uhn.fhir.context.BaseRuntimeElementDefinition;
import ca.uhn.fhir.model.api.ExtensionDt;
import ca.uhn.fhir.model.api.ISupportsUndeclaredExtensions;
+import java.util.List;
+
/**
* @see FhirTerser#visit(IBaseResource, IModelVisitor)
*/
@@ -39,7 +41,7 @@ public interface IModelVisitor {
* @param theChildDefinition May be null if this is a root element
* @param theDefinition
*/
- void acceptElement(IBase theElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition);
+ void acceptElement(IBase theElement, List thePathToElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition);
/**
*
@@ -48,7 +50,7 @@ public interface IModelVisitor {
* @param theDefinition
* @param theNextExt
*/
- void acceptUndeclaredExtension(ISupportsUndeclaredExtensions theContainingElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition, ExtensionDt theNextExt);
+ void acceptUndeclaredExtension(ISupportsUndeclaredExtensions theContainingElement, List thePathToElement, BaseRuntimeChildDefinition theChildDefinition, BaseRuntimeElementDefinition theDefinition, ExtensionDt theNextExt);
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java
index 1c634d695fa..fd50f9f5a81 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java
@@ -28,58 +28,71 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.hl7.fhir.instance.model.IBaseResource;
+import java.util.Iterator;
+import java.util.List;
import java.util.Set;
/**
* Created by Bill de Beaubien on 2/26/2015.
*/
public class ResourceReferenceInfo {
- private String myOwningResource;
- private String myName;
- private BaseResourceReferenceDt myResource;
+ private String myOwningResource;
+ private String myName;
+ private BaseResourceReferenceDt myResource;
- public ResourceReferenceInfo(IBaseResource theOwningResource, String theName, BaseResourceReferenceDt theResource) {
- myOwningResource = theOwningResource.getClass().getAnnotation(ResourceDef.class).name();
- myName = theName;
- myResource = theResource;
- }
+ public ResourceReferenceInfo(IBaseResource theOwningResource, List thePathToElement, BaseResourceReferenceDt theResource) {
+ myOwningResource = theOwningResource.getClass().getAnnotation(ResourceDef.class).name();
+ myResource = theResource;
+ if (thePathToElement != null && !thePathToElement.isEmpty()) {
+ StringBuilder sb = new StringBuilder();
+ thePathToElement.iterator();
+ for (Iterator iterator = thePathToElement.iterator(); iterator.hasNext(); ) {
+ sb.append(iterator.next());
+ if (iterator.hasNext())
+ sb.append(".");
+ }
+ myName = sb.toString();
+ } else {
+ myName = null;
+ }
+ }
- @Override
- public String toString() {
- ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE);
- b.append("name", myName);
- b.append("resource", myResource.getReference());
- return b.build();
- }
+ @Override
+ public String toString() {
+ ToStringBuilder b = new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE);
+ b.append("name", myName);
+ b.append("resource", myResource.getReference());
+ return b.build();
+ }
- public String getName() {
- return myName;
- }
+ public String getName() {
+ return myName;
+ }
- public BaseResourceReferenceDt getResourceReference() {
- return myResource;
- }
+ public BaseResourceReferenceDt getResourceReference() {
+ return myResource;
+ }
- public boolean matchesIncludeSet(Set theIncludes) {
- if (theIncludes == null)
- return false;
- for (Include include : theIncludes) {
- if (matchesInclude(include))
- return true;
- }
- return false;
- }
+ public boolean matchesIncludeSet(Set theIncludes) {
+ if (theIncludes == null)
+ return false;
+ for (Include include : theIncludes) {
+ if (matchesInclude(include))
+ return true;
+ }
+ return false;
+ }
- public boolean matchesInclude(Include theInclude) {
- if (theInclude.getValue().equals("*")) {
- return true;
- }
- if (theInclude.getValue().indexOf(':') != -1) {
- // DSTU2 style
- return (theInclude.getValue().equals(myOwningResource + ':' + myName));
- } else {
- // DSTU1 style
- return (theInclude.getValue().equals(myOwningResource + '.' + myName));
- }
- }
+ public boolean matchesInclude(Include theInclude) {
+ if (theInclude.getValue().equals("*")) {
+ return true;
+ }
+ if (theInclude.getValue().indexOf(':') != -1) {
+ // DSTU2 style
+ return (theInclude.getValue().equals(myOwningResource + ':' + myName));
+ } else {
+ // DSTU1 style
+ return (theInclude.getValue().equals(myOwningResource + '.' + myName));
+ }
+ }
}
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseFhirDao.java
index 6f9b45405c2..b4a58ff2c61 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseFhirDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseFhirDao.java
@@ -20,8 +20,7 @@ package ca.uhn.fhir.jpa.dao;
* #L%
*/
-import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.*;
import java.io.UnsupportedEncodingException;
import java.net.URI;
@@ -444,12 +443,12 @@ public abstract class BaseFhirDao implements IDao {
}
@Override
- public List getResources(final int theFromIndex, final int theToIndex) {
+ public List getResources(final int theFromIndex, final int theToIndex) {
final StopWatch timer = new StopWatch();
TransactionTemplate template = new TransactionTemplate(myPlatformTransactionManager);
- return template.execute(new TransactionCallback>() {
+ return template.execute(new TransactionCallback>() {
@Override
- public List doInTransaction(TransactionStatus theStatus) {
+ public List doInTransaction(TransactionStatus theStatus) {
List resEntities = Lists.newArrayList();
List tupleSubList = tuples.subList(theFromIndex, theToIndex);
@@ -471,7 +470,7 @@ public abstract class BaseFhirDao implements IDao {
resEntities = resEntities.subList(0, limit);
}
- ArrayList retVal = new ArrayList();
+ ArrayList retVal = new ArrayList();
for (BaseHasResource next : resEntities) {
RuntimeResourceDefinition type;
try {
@@ -514,7 +513,7 @@ public abstract class BaseFhirDao implements IDao {
return true;
}
- protected List loadResourcesById(Set theIncludePids) {
+ protected List loadResourcesById(Set theIncludePids) {
Set pids = new HashSet();
for (IdDt next : theIncludePids) {
if (next.isIdPartValidLong()) {
@@ -528,6 +527,10 @@ public abstract class BaseFhirDao implements IDao {
}
}
+ if (pids.isEmpty()) {
+ return new ArrayList();
+ }
+
CriteriaBuilder builder = myEntityManager.getCriteriaBuilder();
CriteriaQuery cq = builder.createQuery(ResourceTable.class);
Root from = cq.from(ResourceTable.class);
@@ -538,7 +541,7 @@ public abstract class BaseFhirDao implements IDao {
// }
TypedQuery q = myEntityManager.createQuery(cq);
- ArrayList retVal = new ArrayList();
+ ArrayList retVal = new ArrayList();
for (ResourceTable next : q.getResultList()) {
IResource resource = (IResource) toResource(next);
retVal.add(resource);
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 935df209c6d..b530d8901e3 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
@@ -20,8 +20,7 @@ package ca.uhn.fhir.jpa.dao;
* #L%
*/
-import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.*;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -660,12 +659,12 @@ public abstract class BaseFhirResourceDao extends BaseFhirD
return new HashSet(q.getResultList());
}
- private List addResourcesAsIncludesById(List theListToPopulate, Set includePids, List resources) {
+ private List addResourcesAsIncludesById(List theListToPopulate, Set includePids, List resources) {
if (!includePids.isEmpty()) {
ourLog.info("Loading {} included resources", includePids.size());
resources = loadResourcesById(includePids);
- for (IResource next : resources) {
- ResourceMetadataKeyEnum.ENTRY_SEARCH_MODE.put(next, BundleEntrySearchModeEnum.INCLUDE);
+ for (IBaseResource next : resources) {
+ ResourceMetadataKeyEnum.ENTRY_SEARCH_MODE.put((IResource) next, BundleEntrySearchModeEnum.INCLUDE);
}
theListToPopulate.addAll(resources);
}
@@ -1000,7 +999,7 @@ public abstract class BaseFhirResourceDao extends BaseFhirD
return tags;
}
- protected abstract List