> myResponseHeaders;
/**
* Constructor
@@ -42,13 +45,10 @@ public class MethodOutcome {
/**
* Constructor
- *
- * @param theId
- * The ID of the created/updated resource
- *
- * @param theCreated
- * If not null, indicates whether the resource was created (as opposed to being updated). This is generally not needed, since the server can assume based on the method being called
- * whether the result was a creation or an update. However, it can be useful if you are implementing an update method that does a create if the ID doesn't already exist.
+ *
+ * @param theId The ID of the created/updated resource
+ * @param theCreated If not null, indicates whether the resource was created (as opposed to being updated). This is generally not needed, since the server can assume based on the method being called
+ * whether the result was a creation or an update. However, it can be useful if you are implementing an update method that does a create if the ID doesn't already exist.
*/
@CoverageIgnore
public MethodOutcome(IIdType theId, Boolean theCreated) {
@@ -58,12 +58,9 @@ public class MethodOutcome {
/**
* Constructor
- *
- * @param theId
- * The ID of the created/updated resource
- *
- * @param theBaseOperationOutcome
- * The operation outcome to return with the response (or null for none)
+ *
+ * @param theId The ID of the created/updated resource
+ * @param theBaseOperationOutcome The operation outcome to return with the response (or null for none)
*/
public MethodOutcome(IIdType theId, IBaseOperationOutcome theBaseOperationOutcome) {
myId = theId;
@@ -72,16 +69,11 @@ public class MethodOutcome {
/**
* Constructor
- *
- * @param theId
- * The ID of the created/updated resource
- *
- * @param theBaseOperationOutcome
- * The operation outcome to return with the response (or null for none)
- *
- * @param theCreated
- * If not null, indicates whether the resource was created (as opposed to being updated). This is generally not needed, since the server can assume based on the method being called
- * whether the result was a creation or an update. However, it can be useful if you are implementing an update method that does a create if the ID doesn't already exist.
+ *
+ * @param theId The ID of the created/updated resource
+ * @param theBaseOperationOutcome The operation outcome to return with the response (or null for none)
+ * @param theCreated If not null, indicates whether the resource was created (as opposed to being updated). This is generally not needed, since the server can assume based on the method being called
+ * whether the result was a creation or an update. However, it can be useful if you are implementing an update method that does a create if the ID doesn't already exist.
*/
public MethodOutcome(IIdType theId, IBaseOperationOutcome theBaseOperationOutcome, Boolean theCreated) {
myId = theId;
@@ -91,9 +83,8 @@ public class MethodOutcome {
/**
* Constructor
- *
- * @param theId
- * The ID of the created/updated resource
+ *
+ * @param theId The ID of the created/updated resource
*/
public MethodOutcome(IIdType theId) {
myId = theId;
@@ -101,9 +92,8 @@ public class MethodOutcome {
/**
* Constructor
- *
- * @param theOperationOutcome
- * The operation outcome resource to return
+ *
+ * @param theOperationOutcome The operation outcome resource to return
*/
public MethodOutcome(IBaseOperationOutcome theOperationOutcome) {
myOperationOutcome = theOperationOutcome;
@@ -117,19 +107,54 @@ public class MethodOutcome {
return myCreated;
}
+ /**
+ * If not null, indicates whether the resource was created (as opposed to being updated). This is generally not needed, since the server can assume based on the method being called whether the
+ * result was a creation or an update. However, it can be useful if you are implementing an update method that does a create if the ID doesn't already exist.
+ *
+ * Users of HAPI should only interact with this method in Server applications
+ *
+ *
+ * @param theCreated If not null, indicates whether the resource was created (as opposed to being updated). This is generally not needed, since the server can assume based on the method being called
+ * whether the result was a creation or an update. However, it can be useful if you are implementing an update method that does a create if the ID doesn't already exist.
+ * @return Returns a reference to this for easy method chaining
+ */
+ public MethodOutcome setCreated(Boolean theCreated) {
+ myCreated = theCreated;
+ return this;
+ }
+
public IIdType getId() {
return myId;
}
+ /**
+ * @param theId The ID of the created/updated resource
+ * @return Returns a reference to this for easy method chaining
+ */
+ public MethodOutcome setId(IIdType theId) {
+ myId = theId;
+ return this;
+ }
+
/**
* Returns the {@link IBaseOperationOutcome} resource to return to the client or null if none.
- *
+ *
* @return This method will return null, unlike many methods in the API.
*/
public IBaseOperationOutcome getOperationOutcome() {
return myOperationOutcome;
}
+ /**
+ * Sets the {@link IBaseOperationOutcome} resource to return to the client. Set to null (which is the default) if none.
+ *
+ * @return Returns a reference to this for easy method chaining
+ */
+ public MethodOutcome setOperationOutcome(IBaseOperationOutcome theBaseOperationOutcome) {
+ myOperationOutcome = theBaseOperationOutcome;
+ return this;
+ }
+
/**
* From a client response: If the method returned an actual resource body (e.g. a create/update with
* "Prefer: return=representation") this field will be populated with the
@@ -139,50 +164,15 @@ public class MethodOutcome {
return myResource;
}
- /**
- * If not null, indicates whether the resource was created (as opposed to being updated). This is generally not needed, since the server can assume based on the method being called whether the
- * result was a creation or an update. However, it can be useful if you are implementing an update method that does a create if the ID doesn't already exist.
- *
- * Users of HAPI should only interact with this method in Server applications
- *
- *
- * @param theCreated
- * If not null, indicates whether the resource was created (as opposed to being updated). This is generally not needed, since the server can assume based on the method being called
- * whether the result was a creation or an update. However, it can be useful if you are implementing an update method that does a create if the ID doesn't already exist.
- * @return Returns a reference to this for easy method chaining
- */
- public MethodOutcome setCreated(Boolean theCreated) {
- myCreated = theCreated;
- return this;
- }
-
- /**
- * @param theId
- * The ID of the created/updated resource
- * @return Returns a reference to this for easy method chaining
- */
- public MethodOutcome setId(IIdType theId) {
- myId = theId;
- return this;
- }
-
- /**
- * Sets the {@link IBaseOperationOutcome} resource to return to the client. Set to null (which is the default) if none.
- * @return Returns a reference to this for easy method chaining
- */
- public MethodOutcome setOperationOutcome(IBaseOperationOutcome theBaseOperationOutcome) {
- myOperationOutcome = theBaseOperationOutcome;
- return this;
- }
-
/**
* In a server response: This field may be populated in server code with the final resource for operations
* where a resource body is being created/updated. E.g. for an update method, this field could be populated with
- * the resource after the update is applied, with the new version ID, lastUpdate time, etc.
+ * the resource after the update is applied, with the new version ID, lastUpdate time, etc.
*
* This field is optional, but if it is populated the server will return the resource body if requested to
* do so via the HTTP Prefer header.
- *
+ *
+ *
* @return Returns a reference to this for easy method chaining
*/
public MethodOutcome setResource(IBaseResource theResource) {
@@ -190,4 +180,23 @@ public class MethodOutcome {
return this;
}
+ /**
+ * Gets the headers for the HTTP response
+ */
+ public Map> getResponseHeaders() {
+ return myResponseHeaders;
+ }
+
+ /**
+ * Sets the headers for the HTTP response
+ */
+ public void setResponseHeaders(Map> theResponseHeaders) {
+ myResponseHeaders = theResponseHeaders;
+ }
+
+ public void setCreatedUsingStatusCode(int theResponseStatusCode) {
+ if (theResponseStatusCode == Constants.STATUS_HTTP_201_CREATED) {
+ setCreated(true);
+ }
+ }
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java
index d7780caa397..697215164de 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpRequest.java
@@ -28,16 +28,18 @@ import java.util.Map;
* Http Request. Allows addition of headers and execution of the request.
*/
public interface IHttpRequest {
-
+
/**
* Add a header to the request
- * @param theName the header name
+ *
+ * @param theName the header name
* @param theValue the header value
*/
void addHeader(String theName, String theValue);
/**
* Execute the request
+ *
* @return the response
*/
IHttpResponse execute() throws IOException;
@@ -50,7 +52,8 @@ public interface IHttpRequest {
/**
* Return the request body as a string.
- * If this is not supported by the underlying technology, null is returned
+ * If this is not supported by the underlying technology, null is returned
+ *
* @return a string representation of the request or null if not supported or empty.
*/
String getRequestBodyFromStream() throws IOException;
@@ -59,10 +62,16 @@ public interface IHttpRequest {
* Return the request URI, or null
*/
String getUri();
-
+
/**
* Return the HTTP verb (e.g. "GET")
*/
String getHttpVerbName();
-
+
+ /**
+ * Remove any headers matching the given name
+ *
+ * @param theHeaderName The header name, e.g. "Accept" (must not be null or blank)
+ */
+ void removeHeaders(String theHeaderName);
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpResponse.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpResponse.java
index 9c5a6f395e6..4e84c9f0617 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpResponse.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IHttpResponse.java
@@ -70,7 +70,7 @@ public interface IHttpResponse {
void close();
/**
- * Returna reader for the response entity
+ * Returns a reader for the response entity
*/
Reader createReader() throws IOException;
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java
index 5cf326bb9f6..763dcaa9cc4 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/exceptions/NonFhirResponseException.java
@@ -19,15 +19,18 @@ package ca.uhn.fhir.rest.client.exceptions;
* limitations under the License.
* #L%
*/
-import static org.apache.commons.lang3.StringUtils.isBlank;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import org.apache.commons.io.IOUtils;
import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
import ca.uhn.fhir.util.CoverageIgnore;
+import com.google.common.base.Charsets;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import static org.apache.commons.lang3.StringUtils.isBlank;
@CoverageIgnore
public class NonFhirResponseException extends BaseServerResponseException {
@@ -36,24 +39,30 @@ public class NonFhirResponseException extends BaseServerResponseException {
/**
* Constructor
- *
- * @param theMessage
- * The message
- * @param theResponseText
- * @param theStatusCode
- * @param theResponseReader
- * @param theContentType
+ *
+ * @param theMessage The message
+ * @param theStatusCode The HTTP status code
*/
NonFhirResponseException(int theStatusCode, String theMessage) {
super(theStatusCode, theMessage);
}
+ public static NonFhirResponseException newInstance(int theStatusCode, String theContentType, InputStream theInputStream) {
+ return newInstance(theStatusCode, theContentType, new InputStreamReader(theInputStream, Charsets.UTF_8));
+ }
+
public static NonFhirResponseException newInstance(int theStatusCode, String theContentType, Reader theReader) {
String responseBody = "";
try {
responseBody = IOUtils.toString(theReader);
} catch (IOException e) {
- IOUtils.closeQuietly(theReader);
+ // ignore
+ } finally {
+ try {
+ theReader.close();
+ } catch (IOException theE) {
+ // ignore
+ }
}
NonFhirResponseException retVal;
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java
index 331575d2605..ffe305acfad 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IClientExecutable.java
@@ -2,6 +2,7 @@ package ca.uhn.fhir.rest.gclient;
import ca.uhn.fhir.rest.api.CacheControlDirective;
import ca.uhn.fhir.rest.api.EncodingEnum;
+import ca.uhn.fhir.rest.api.RequestFormatParamStyleEnum;
import ca.uhn.fhir.rest.api.SummaryEnum;
import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -28,12 +29,12 @@ import java.util.List;
*/
-public interface IClientExecutable, Y> {
+public interface IClientExecutable, Y> {
/**
* If set to true, the client will log the request and response to the SLF4J logger. This can be useful for
* debugging, but is generally not desirable in a production situation.
- *
+ *
* @deprecated Use the client logging interceptor to log requests and responses instead. See here for more information.
*/
@Deprecated
@@ -46,16 +47,45 @@ public interface IClientExecutable, Y> {
T cacheControl(CacheControlDirective theCacheControlDirective);
/**
- * Request that the server return subsetted resources, containing only the elements specified in the given parameters.
+ * Request that the server return subsetted resources, containing only the elements specified in the given parameters.
* For example: subsetElements("name", "identifier") requests that the server only return
- * the "name" and "identifier" fields in the returned resource, and omit any others.
+ * the "name" and "identifier" fields in the returned resource, and omit any others.
*/
T elementsSubset(String... theElements);
+ /**
+ * Request that the server respond with JSON via the Accept header and possibly also the
+ * _format parameter if {@link ca.uhn.fhir.rest.client.api.IRestfulClient#setFormatParamStyle(RequestFormatParamStyleEnum) configured to do so}.
+ *
+ * This method will have no effect if {@link #accept(String) a custom Accept header} is specified.
+ *
+ *
+ * @see #accept(String)
+ */
T encoded(EncodingEnum theEncoding);
+ /**
+ * Request that the server respond with JSON via the Accept header and possibly also the
+ * _format parameter if {@link ca.uhn.fhir.rest.client.api.IRestfulClient#setFormatParamStyle(RequestFormatParamStyleEnum) configured to do so}.
+ *
+ * This method will have no effect if {@link #accept(String) a custom Accept header} is specified.
+ *
+ *
+ * @see #accept(String)
+ * @see #encoded(EncodingEnum)
+ */
T encodedJson();
+ /**
+ * Request that the server respond with JSON via the Accept header and possibly also the
+ * _format parameter if {@link ca.uhn.fhir.rest.client.api.IRestfulClient#setFormatParamStyle(RequestFormatParamStyleEnum) configured to do so}.
+ *
+ * This method will have no effect if {@link #accept(String) a custom Accept header} is specified.
+ *
+ *
+ * @see #accept(String)
+ * @see #encoded(EncodingEnum)
+ */
T encodedXml();
/**
@@ -84,11 +114,33 @@ public interface IClientExecutable, Y> {
*/
T preferResponseTypes(List> theTypes);
+ /**
+ * Request pretty-printed response via the _pretty parameter
+ */
T prettyPrint();
/**
- * Request that the server modify the response using the _summary param
+ * Request that the server modify the response using the _summary param
*/
T summaryMode(SummaryEnum theSummary);
+ /**
+ * Specifies a custom Accept header that should be supplied with the
+ * request.
+ *
+ * Note that this method overrides any encoding preferences specified with
+ * {@link #encodedJson()} or {@link #encodedXml()}. It is generally easier to
+ * just use those methods if you simply want to request a specific FHIR encoding.
+ *
+ *
+ * @param theHeaderValue The header value, e.g. "application/fhir+json". Constants such
+ * as {@link ca.uhn.fhir.rest.api.Constants#CT_FHIR_XML_NEW} and
+ * {@link ca.uhn.fhir.rest.api.Constants#CT_FHIR_JSON_NEW} may
+ * be useful. If set to null or an empty string, the
+ * default Accept header will be used.
+ * @see #encoded(EncodingEnum)
+ * @see #encodedJson()
+ * @see #encodedXml()
+ */
+ T accept(String theHeaderValue);
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInput.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInput.java
index ba922755475..ea41945171b 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInput.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IOperationUntypedWithInput.java
@@ -20,6 +20,7 @@ package ca.uhn.fhir.rest.gclient;
* #L%
*/
+import ca.uhn.fhir.rest.api.MethodOutcome;
import org.hl7.fhir.instance.model.api.IBaseResource;
public interface IOperationUntypedWithInput extends IClientExecutable, T> {
@@ -43,4 +44,9 @@ public interface IOperationUntypedWithInput extends IClientExecutable IOperationUntypedWithInput returnResourceType(Class theReturnType);
+ /**
+ * Request that the method chain returns a {@link MethodOutcome} object. This object
+ * will contain details
+ */
+ IOperationUntypedWithInput returnMethodOutcome();
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java
index 669ebe2a57a..d25afa5340d 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/TokenParam.java
@@ -100,7 +100,11 @@ public class TokenParam extends BaseParam /*implements IQueryParameterType*/ {
@Override
String doGetValueAsQueryToken(FhirContext theContext) {
if (getSystem() != null) {
- return ParameterUtil.escape(StringUtils.defaultString(getSystem())) + '|' + ParameterUtil.escape(getValue());
+ if (getValue() != null) {
+ return ParameterUtil.escape(StringUtils.defaultString(getSystem())) + '|' + ParameterUtil.escape(getValue());
+ } else {
+ return ParameterUtil.escape(StringUtils.defaultString(getSystem())) + '|';
+ }
}
return ParameterUtil.escape(getValue());
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java
index a7fa566afa8..73fd6e72385 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java
@@ -25,6 +25,7 @@ public enum VersionEnum {
V3_3_0,
V3_4_0,
V3_5_0,
- V3_6_0
+ V3_6_0,
+ V3_7_0
}
diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
index 14064dda16c..1ffeda550f2 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
+++ b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 3.6.0
+ 3.7.0-SNAPSHOT
../../hapi-deployable-pom/pom.xml
@@ -188,7 +188,7 @@
org.thymeleaf
- thymeleaf-spring4
+ thymeleaf-spring5
diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
index b4310b6332e..83ee05de03a 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
+++ b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-fhir-cli
- 3.6.0
+ 3.7.0-SNAPSHOT
../pom.xml
@@ -43,6 +43,14 @@
classes
+
+
diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
index cbcd59063a5..ed09890f69c 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
+++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-fhir-cli
- 3.6.0
+ 3.7.0-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml
index 7392f0df5ab..5bf001beef5 100644
--- a/hapi-fhir-cli/pom.xml
+++ b/hapi-fhir-cli/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 3.6.0
+ 3.7.0-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml
index 30d391c91d3..08842064b96 100644
--- a/hapi-fhir-client-okhttp/pom.xml
+++ b/hapi-fhir-client-okhttp/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 3.6.0
+ 3.7.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java
index 5ad07eceb2d..e8569f9c755 100644
--- a/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java
+++ b/hapi-fhir-client-okhttp/src/main/java/ca/uhn/fhir/okhttp/client/OkHttpRestfulRequest.java
@@ -94,4 +94,9 @@ public class OkHttpRestfulRequest implements IHttpRequest {
return myRequestTypeEnum.name();
}
+ @Override
+ public void removeHeaders(String theHeaderName) {
+ myRequestBuilder.removeHeader(theHeaderName);
+ }
+
}
diff --git a/hapi-fhir-client/pom.xml b/hapi-fhir-client/pom.xml
index 07fab225886..052fc0b3208 100644
--- a/hapi-fhir-client/pom.xml
+++ b/hapi-fhir-client/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 3.6.0
+ 3.7.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpRequest.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpRequest.java
index f968eb8901b..895c2a526fa 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpRequest.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpRequest.java
@@ -20,12 +20,11 @@ package ca.uhn.fhir.rest.client.apache;
* #L%
*/
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.*;
-
+import ca.uhn.fhir.rest.client.api.IHttpRequest;
+import ca.uhn.fhir.rest.client.api.IHttpResponse;
import ca.uhn.fhir.util.StopWatch;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.Validate;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpEntityEnclosingRequest;
@@ -34,13 +33,14 @@ import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.entity.ContentType;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.*;
/**
* A Http Request based on Apache. This is an adapter around the class
* {@link org.apache.http.client.methods.HttpRequestBase HttpRequestBase}
- *
+ *
* @author Peter Van Houte | peter.vanhoute@agfa.com | Agfa Healthcare
*/
public class ApacheHttpRequest implements IHttpRequest {
@@ -79,6 +79,7 @@ public class ApacheHttpRequest implements IHttpRequest {
/**
* Get the ApacheRequest
+ *
* @return the ApacheRequest
*/
public HttpRequestBase getApacheRequest() {
@@ -90,6 +91,12 @@ public class ApacheHttpRequest implements IHttpRequest {
return myRequest.getMethod();
}
+ @Override
+ public void removeHeaders(String theHeaderName) {
+ Validate.notBlank(theHeaderName, "theHeaderName must not be null or blank");
+ myRequest.removeHeaders(theHeaderName);
+ }
+
@Override
public String getRequestBodyFromStream() throws IOException {
if (myRequest instanceof HttpEntityEnclosingRequest) {
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseClient.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseClient.java
index e81a7486170..d130179a6d0 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseClient.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseClient.java
@@ -33,19 +33,20 @@ import ca.uhn.fhir.rest.client.method.IClientResponseHandler;
import ca.uhn.fhir.rest.client.method.IClientResponseHandlerHandlesBinary;
import ca.uhn.fhir.rest.client.method.MethodUtil;
import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
+import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
+import ca.uhn.fhir.util.BinaryUtil;
import ca.uhn.fhir.util.OperationOutcomeUtil;
import ca.uhn.fhir.util.XmlDetectionUtil;
+import com.google.common.base.Charsets;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.hl7.fhir.instance.model.api.*;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
+import java.io.*;
import java.util.*;
+import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
public abstract class BaseClient implements IRestfulClient {
@@ -93,14 +94,16 @@ public abstract class BaseClient implements IRestfulClient {
}
- protected Map> createExtraParams() {
- HashMap> retVal = new LinkedHashMap>();
+ protected Map> createExtraParams(String theCustomAcceptHeader) {
+ HashMap> retVal = new LinkedHashMap<>();
- if (myRequestFormatParamStyle == RequestFormatParamStyleEnum.SHORT) {
- if (getEncoding() == EncodingEnum.XML) {
- retVal.put(Constants.PARAM_FORMAT, Collections.singletonList("xml"));
- } else if (getEncoding() == EncodingEnum.JSON) {
- retVal.put(Constants.PARAM_FORMAT, Collections.singletonList("json"));
+ if (isBlank(theCustomAcceptHeader)) {
+ if (myRequestFormatParamStyle == RequestFormatParamStyleEnum.SHORT) {
+ if (getEncoding() == EncodingEnum.XML) {
+ retVal.put(Constants.PARAM_FORMAT, Collections.singletonList("xml"));
+ } else if (getEncoding() == EncodingEnum.JSON) {
+ retVal.put(Constants.PARAM_FORMAT, Collections.singletonList("json"));
+ }
}
}
@@ -115,7 +118,7 @@ public abstract class BaseClient implements IRestfulClient {
public T fetchResourceFromUrl(Class theResourceType, String theUrl) {
BaseHttpClientInvocation clientInvocation = new HttpGetClientInvocation(getFhirContext(), theUrl);
ResourceResponseHandler binding = new ResourceResponseHandler(theResourceType);
- return invokeClient(getFhirContext(), binding, clientInvocation, null, false, false, null, null, null);
+ return invokeClient(getFhirContext(), binding, clientInvocation, null, false, false, null, null, null, null);
}
void forceConformanceCheck() {
@@ -200,11 +203,11 @@ public abstract class BaseClient implements IRestfulClient {
}
T invokeClient(FhirContext theContext, IClientResponseHandler binding, BaseHttpClientInvocation clientInvocation, boolean theLogRequestAndResponse) {
- return invokeClient(theContext, binding, clientInvocation, null, null, theLogRequestAndResponse, null, null, null);
+ return invokeClient(theContext, binding, clientInvocation, null, null, theLogRequestAndResponse, null, null, null, null);
}
T invokeClient(FhirContext theContext, IClientResponseHandler binding, BaseHttpClientInvocation clientInvocation, EncodingEnum theEncoding, Boolean thePrettyPrint,
- boolean theLogRequestAndResponse, SummaryEnum theSummaryMode, Set theSubsetElements, CacheControlDirective theCacheControlDirective) {
+ boolean theLogRequestAndResponse, SummaryEnum theSummaryMode, Set theSubsetElements, CacheControlDirective theCacheControlDirective, String theCustomAcceptHeader) {
if (!myDontValidateConformance) {
myFactory.validateServerBaseIfConfiguredToDoSo(myUrlBase, myClient, this);
@@ -215,10 +218,10 @@ public abstract class BaseClient implements IRestfulClient {
IHttpRequest httpRequest = null;
IHttpResponse response = null;
try {
- Map> params = createExtraParams();
+ Map> params = createExtraParams(theCustomAcceptHeader);
if (clientInvocation instanceof HttpGetClientInvocation) {
- if (myRequestFormatParamStyle == RequestFormatParamStyleEnum.SHORT) {
+ if (myRequestFormatParamStyle == RequestFormatParamStyleEnum.SHORT && isBlank(theCustomAcceptHeader)) {
if (theEncoding == EncodingEnum.XML) {
params.put(Constants.PARAM_FORMAT, Collections.singletonList("xml"));
} else if (theEncoding == EncodingEnum.JSON) {
@@ -248,6 +251,11 @@ public abstract class BaseClient implements IRestfulClient {
httpRequest = clientInvocation.asHttpRequest(myUrlBase, params, encoding, thePrettyPrint);
+ if (isNotBlank(theCustomAcceptHeader)) {
+ httpRequest.removeHeaders(Constants.HEADER_ACCEPT);
+ httpRequest.addHeader(Constants.HEADER_ACCEPT, theCustomAcceptHeader);
+ }
+
if (theCacheControlDirective != null) {
StringBuilder b = new StringBuilder();
addToCacheControlHeader(b, Constants.CACHE_CONTROL_NO_CACHE, theCacheControlDirective.isNoCache());
@@ -289,14 +297,10 @@ public abstract class BaseClient implements IRestfulClient {
if (response.getStatus() < 200 || response.getStatus() > 299) {
String body = null;
- Reader reader = null;
- try {
- reader = response.createReader();
+ try (Reader reader = response.createReader()) {
body = IOUtils.toString(reader);
} catch (Exception e) {
ourLog.debug("Failed to read input stream", e);
- } finally {
- IOUtils.closeQuietly(reader);
}
String message = "HTTP " + response.getStatus() + " " + response.getStatusInfo();
@@ -334,27 +338,24 @@ public abstract class BaseClient implements IRestfulClient {
if (binding instanceof IClientResponseHandlerHandlesBinary) {
IClientResponseHandlerHandlesBinary handlesBinary = (IClientResponseHandlerHandlesBinary) binding;
if (handlesBinary.isBinary()) {
- InputStream reader = response.readEntity();
- try {
- return handlesBinary.invokeClient(mimeType, reader, response.getStatus(), headers);
- } finally {
- IOUtils.closeQuietly(reader);
+ try (InputStream reader = response.readEntity()) {
+ return handlesBinary.invokeClientForBinary(mimeType, reader, response.getStatus(), headers);
}
}
}
- Reader reader = response.createReader();
+ try (InputStream inputStream = response.readEntity()) {
+ InputStream inputStreamToReturn = inputStream;
- if (ourLog.isTraceEnabled() || myKeepResponses || theLogRequestAndResponse) {
- String responseString = IOUtils.toString(reader);
- keepResponseAndLogIt(theLogRequestAndResponse, response, responseString);
- reader = new StringReader(responseString);
- }
+ if (ourLog.isTraceEnabled() || myKeepResponses || theLogRequestAndResponse) {
+ if (inputStream != null) {
+ String responseString = IOUtils.toString(inputStream, Charsets.UTF_8);
+ keepResponseAndLogIt(theLogRequestAndResponse, response, responseString);
+ inputStreamToReturn = new ByteArrayInputStream(responseString.getBytes(Charsets.UTF_8));
+ }
+ }
- try {
- return binding.invokeClient(mimeType, reader, response.getStatus(), headers);
- } finally {
- IOUtils.closeQuietly(reader);
+ return binding.invokeClient(mimeType, inputStreamToReturn, response.getStatus(), headers);
}
} catch (DataFormatException e) {
@@ -463,7 +464,48 @@ public abstract class BaseClient implements IRestfulClient {
myInterceptors.remove(theInterceptor);
}
- protected final class ResourceResponseHandler implements IClientResponseHandler {
+ protected final class ResourceOrBinaryResponseHandler extends ResourceResponseHandler {
+
+
+ @Override
+ public IBaseResource invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders) throws BaseServerResponseException {
+
+ /*
+ * For operation responses, if the response content type is a FHIR content-type
+ * (which is will probably almost always be) we just handle it normally. However,
+ * if we get back a successful (2xx) response from an operation, and the content
+ * type is something other than FHIR, we'll return it as a Binary wrapped in
+ * a Parameters resource.
+ */
+ EncodingEnum respType = EncodingEnum.forContentType(theResponseMimeType);
+ if (respType != null || theResponseStatusCode < 200 || theResponseStatusCode >= 300) {
+ return super.invokeClient(theResponseMimeType, theResponseInputStream, theResponseStatusCode, theHeaders);
+ }
+
+ // Create a Binary resource to return
+ IBaseBinary responseBinary = BinaryUtil.newBinary(getFhirContext());
+
+ // Fetch the content type
+ String contentType = null;
+ List contentTypeHeaders = theHeaders.get(Constants.HEADER_CONTENT_TYPE_LC);
+ if (contentTypeHeaders != null && contentTypeHeaders.size() > 0) {
+ contentType = contentTypeHeaders.get(0);
+ }
+ responseBinary.setContentType(contentType);
+
+ // Fetch the content itself
+ try {
+ responseBinary.setContent(IOUtils.toByteArray(theResponseInputStream));
+ } catch (IOException e) {
+ throw new InternalErrorException("IO failure parsing response", e);
+ }
+
+ return responseBinary;
+ }
+
+ }
+
+ protected class ResourceResponseHandler implements IClientResponseHandler {
private boolean myAllowHtmlResponse;
private IIdType myId;
@@ -498,20 +540,20 @@ public abstract class BaseClient implements IRestfulClient {
}
@Override
- public T invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws BaseServerResponseException {
+ public T invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders) throws BaseServerResponseException {
EncodingEnum respType = EncodingEnum.forContentType(theResponseMimeType);
if (respType == null) {
if (myAllowHtmlResponse && theResponseMimeType.toLowerCase().contains(Constants.CT_HTML) && myReturnType != null) {
- return readHtmlResponse(theResponseReader);
+ return readHtmlResponse(theResponseInputStream);
}
- throw NonFhirResponseException.newInstance(theResponseStatusCode, theResponseMimeType, theResponseReader);
+ throw NonFhirResponseException.newInstance(theResponseStatusCode, theResponseMimeType, theResponseInputStream);
}
IParser parser = respType.newParser(getFhirContext());
parser.setServerBaseUrl(getUrlBase());
if (myPreferResponseTypes != null) {
parser.setPreferTypes(myPreferResponseTypes);
}
- T retVal = parser.parseResource(myReturnType, theResponseReader);
+ T retVal = parser.parseResource(myReturnType, theResponseInputStream);
MethodUtil.parseClientRequestResourceHeaders(myId, theHeaders, retVal);
@@ -519,7 +561,7 @@ public abstract class BaseClient implements IRestfulClient {
}
@SuppressWarnings("unchecked")
- private T readHtmlResponse(Reader theResponseReader) {
+ private T readHtmlResponse(InputStream theResponseInputStream) {
RuntimeResourceDefinition resDef = getFhirContext().getResourceDefinition(myReturnType);
IBaseResource instance = resDef.newInstance();
BaseRuntimeChildDefinition textChild = resDef.getChildByName("text");
@@ -531,7 +573,7 @@ public abstract class BaseClient implements IRestfulClient {
BaseRuntimeElementDefinition divElement = divChild.getChildByName("div");
IPrimitiveType divInstance = (IPrimitiveType) divElement.newInstance();
try {
- divInstance.setValueAsString(IOUtils.toString(theResponseReader));
+ divInstance.setValueAsString(IOUtils.toString(theResponseInputStream, Charsets.UTF_8));
} catch (Exception e) {
throw new InvalidResponseException(400, "Failed to process HTML response from server: " + e.getMessage(), e);
}
@@ -539,8 +581,9 @@ public abstract class BaseClient implements IRestfulClient {
return (T) instance;
}
- public void setPreferResponseTypes(List> thePreferResponseTypes) {
+ public ResourceResponseHandler setPreferResponseTypes(List> thePreferResponseTypes) {
myPreferResponseTypes = thePreferResponseTypes;
+ return this;
}
}
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java
index b9705fc3534..175efe5c7ba 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java
@@ -46,19 +46,19 @@ import ca.uhn.fhir.rest.server.exceptions.NotModifiedException;
import ca.uhn.fhir.util.ICallable;
import ca.uhn.fhir.util.ParametersUtil;
import ca.uhn.fhir.util.UrlUtil;
+import com.google.common.base.Charsets;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.hl7.fhir.instance.model.api.*;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.util.*;
import java.util.Map.Entry;
-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.*;
/**
* @author James Agnew
@@ -98,7 +98,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
}
private T doReadOrVRead(final Class theType, IIdType theId, boolean theVRead, ICallable theNotModifiedHandler, String theIfVersionMatches, Boolean thePrettyPrint,
- SummaryEnum theSummary, EncodingEnum theEncoding, Set theSubsetElements) {
+ SummaryEnum theSummary, EncodingEnum theEncoding, Set theSubsetElements, String theCustomAcceptHeaderValue) {
String resName = toResourceName(theType);
IIdType id = theId;
if (!id.hasBaseUrl()) {
@@ -120,7 +120,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
}
}
if (isKeepResponses()) {
- myLastRequest = invocation.asHttpRequest(getServerBase(), createExtraParams(), getEncoding(), isPrettyPrint());
+ myLastRequest = invocation.asHttpRequest(getServerBase(), createExtraParams(theCustomAcceptHeaderValue), getEncoding(), isPrettyPrint());
}
if (theIfVersionMatches != null) {
@@ -131,10 +131,10 @@ public class GenericClient extends BaseClient implements IGenericClient {
ResourceResponseHandler binding = new ResourceResponseHandler<>(theType, (Class) null, id, allowHtmlResponse);
if (theNotModifiedHandler == null) {
- return invokeClient(myContext, binding, invocation, theEncoding, thePrettyPrint, myLogRequestAndResponse, theSummary, theSubsetElements, null);
+ return invokeClient(myContext, binding, invocation, theEncoding, thePrettyPrint, myLogRequestAndResponse, theSummary, theSubsetElements, null, theCustomAcceptHeaderValue);
}
try {
- return invokeClient(myContext, binding, invocation, theEncoding, thePrettyPrint, myLogRequestAndResponse, theSummary, theSubsetElements, null);
+ return invokeClient(myContext, binding, invocation, theEncoding, thePrettyPrint, myLogRequestAndResponse, theSummary, theSubsetElements, null, theCustomAcceptHeaderValue);
} catch (NotModifiedException e) {
return theNotModifiedHandler.call();
}
@@ -228,7 +228,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
@Override
public T read(final Class theType, UriDt theUrl) {
IdDt id = theUrl instanceof IdDt ? ((IdDt) theUrl) : new IdDt(theUrl);
- return doReadOrVRead(theType, id, false, null, null, false, null, null, null);
+ return doReadOrVRead(theType, id, false, null, null, false, null, null, null, null);
}
@Override
@@ -269,7 +269,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
public MethodOutcome update(IdDt theIdDt, IBaseResource theResource) {
BaseHttpClientInvocation invocation = MethodUtil.createUpdateInvocation(theResource, null, theIdDt, myContext);
if (isKeepResponses()) {
- myLastRequest = invocation.asHttpRequest(getServerBase(), createExtraParams(), getEncoding(), isPrettyPrint());
+ myLastRequest = invocation.asHttpRequest(getServerBase(), createExtraParams(null), getEncoding(), isPrettyPrint());
}
OutcomeResponseHandler binding = new OutcomeResponseHandler();
@@ -293,7 +293,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
invocation = ValidateMethodBindingDstu2Plus.createValidateInvocation(myContext, theResource);
if (isKeepResponses()) {
- myLastRequest = invocation.asHttpRequest(getServerBase(), createExtraParams(), getEncoding(), isPrettyPrint());
+ myLastRequest = invocation.asHttpRequest(getServerBase(), createExtraParams(null), getEncoding(), isPrettyPrint());
}
OutcomeResponseHandler binding = new OutcomeResponseHandler();
@@ -306,7 +306,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
if (theId.hasVersionIdPart() == false) {
throw new IllegalArgumentException(myContext.getLocalizer().getMessage(I18N_NO_VERSION_ID_FOR_VREAD, theId.getValue()));
}
- return doReadOrVRead(theType, theId, true, null, null, false, null, null, null);
+ return doReadOrVRead(theType, theId, true, null, null, false, null, null, null, null);
}
@Override
@@ -315,49 +315,6 @@ public class GenericClient extends BaseClient implements IGenericClient {
return vread(theType, resId);
}
- private static void addParam(Map> params, String parameterName, String parameterValue) {
- if (!params.containsKey(parameterName)) {
- params.put(parameterName, new ArrayList<>());
- }
- params.get(parameterName).add(parameterValue);
- }
-
- private static void addPreferHeader(PreferReturnEnum thePrefer, BaseHttpClientInvocation theInvocation) {
- if (thePrefer != null) {
- theInvocation.addHeader(Constants.HEADER_PREFER, Constants.HEADER_PREFER_RETURN + '=' + thePrefer.getHeaderValue());
- }
- }
-
- private static String validateAndEscapeConditionalUrl(String theSearchUrl) {
- Validate.notBlank(theSearchUrl, "Conditional URL can not be blank/null");
- StringBuilder b = new StringBuilder();
- boolean haveHadQuestionMark = false;
- for (int i = 0; i < theSearchUrl.length(); i++) {
- char nextChar = theSearchUrl.charAt(i);
- if (!haveHadQuestionMark) {
- if (nextChar == '?') {
- haveHadQuestionMark = true;
- } else if (!Character.isLetter(nextChar)) {
- throw new IllegalArgumentException("Conditional URL must be in the format \"[ResourceType]?[Params]\" and must not have a base URL - Found: " + theSearchUrl);
- }
- b.append(nextChar);
- } else {
- switch (nextChar) {
- case '|':
- case '?':
- case '$':
- case ':':
- b.append(UrlUtil.escapeUrlParam(Character.toString(nextChar)));
- break;
- default:
- b.append(nextChar);
- break;
- }
- }
- }
- return b.toString();
- }
-
private enum MetaOperation {
ADD,
DELETE,
@@ -366,14 +323,25 @@ public class GenericClient extends BaseClient implements IGenericClient {
private abstract class BaseClientExecutable, Y> implements IClientExecutable {
- protected EncodingEnum myParamEncoding;
- protected Boolean myPrettyPrint;
- protected SummaryEnum mySummaryMode;
- protected CacheControlDirective myCacheControlDirective;
+ EncodingEnum myParamEncoding;
+ Boolean myPrettyPrint;
+ SummaryEnum mySummaryMode;
+ CacheControlDirective myCacheControlDirective;
+ private String myCustomAcceptHeaderValue;
private List> myPreferResponseTypes;
private boolean myQueryLogRequestAndResponse;
private HashSet mySubsetElements;
+ public String getCustomAcceptHeaderValue() {
+ return myCustomAcceptHeaderValue;
+ }
+
+ @Override
+ public T accept(String theHeaderValue) {
+ myCustomAcceptHeaderValue = theHeaderValue;
+ return (T) this;
+ }
+
@Deprecated // override deprecated method
@SuppressWarnings("unchecked")
@Override
@@ -392,7 +360,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
@Override
public T elementsSubset(String... theElements) {
if (theElements != null && theElements.length > 0) {
- mySubsetElements = new HashSet(Arrays.asList(theElements));
+ mySubsetElements = new HashSet<>(Arrays.asList(theElements));
} else {
mySubsetElements = null;
}
@@ -444,7 +412,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
myLastRequest = theInvocation.asHttpRequest(getServerBase(), theParams, getEncoding(), myPrettyPrint);
}
- Z resp = invokeClient(myContext, theHandler, theInvocation, myParamEncoding, myPrettyPrint, myQueryLogRequestAndResponse || myLogRequestAndResponse, mySummaryMode, mySubsetElements, myCacheControlDirective);
+ Z resp = invokeClient(myContext, theHandler, theInvocation, myParamEncoding, myPrettyPrint, myQueryLogRequestAndResponse || myLogRequestAndResponse, mySummaryMode, mySubsetElements, myCacheControlDirective, myCustomAcceptHeaderValue);
return resp;
}
@@ -461,7 +429,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
public T preferResponseType(Class theClass) {
myPreferResponseTypes = null;
if (theClass != null) {
- myPreferResponseTypes = new ArrayList>();
+ myPreferResponseTypes = new ArrayList<>();
myPreferResponseTypes.add(theClass);
}
return (T) this;
@@ -1021,14 +989,14 @@ public class GenericClient extends BaseClient implements IGenericClient {
@SuppressWarnings("unchecked")
@Override
- public T invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws BaseServerResponseException {
+ public T invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders) throws BaseServerResponseException {
EncodingEnum respType = EncodingEnum.forContentType(theResponseMimeType);
if (respType == null) {
- throw NonFhirResponseException.newInstance(theResponseStatusCode, theResponseMimeType, theResponseReader);
+ throw NonFhirResponseException.newInstance(theResponseStatusCode, theResponseMimeType, theResponseInputStream);
}
IParser parser = respType.newParser(myContext);
RuntimeResourceDefinition type = myContext.getResourceDefinition("Parameters");
- IBaseResource retVal = parser.parseResource(type.getImplementingClass(), theResponseReader);
+ IBaseResource retVal = parser.parseResource(type.getImplementingClass(), theResponseInputStream);
BaseRuntimeChildDefinition paramChild = type.getChildByName("parameter");
BaseRuntimeElementCompositeDefinition paramChildElem = (BaseRuntimeElementCompositeDefinition) paramChild.getChildByName("parameter");
@@ -1061,6 +1029,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
private Class myReturnResourceType;
private Class myType;
private boolean myUseHttpGet;
+ private boolean myReturnMethodOutcome;
@SuppressWarnings("unchecked")
private void addParam(String theName, IBase theValue) {
@@ -1170,11 +1139,19 @@ public class GenericClient extends BaseClient implements IGenericClient {
Object retVal = invoke(null, handler, invocation);
return retVal;
}
- ResourceResponseHandler handler;
- handler = new ResourceResponseHandler();
- handler.setPreferResponseTypes(getPreferResponseTypes(myType));
+ IClientResponseHandler handler = new ResourceOrBinaryResponseHandler()
+ .setPreferResponseTypes(getPreferResponseTypes(myType));
+
+ if (myReturnMethodOutcome) {
+ handler = new MethodOutcomeResponseHandler(handler);
+ }
Object retVal = invoke(null, handler, invocation);
+
+ if (myReturnMethodOutcome) {
+ return retVal;
+ }
+
if (myContext.getResourceDefinition((IBaseResource) retVal).getName().equals("Parameters")) {
return retVal;
}
@@ -1236,6 +1213,12 @@ public class GenericClient extends BaseClient implements IGenericClient {
return this;
}
+ @Override
+ public IOperationUntypedWithInput returnMethodOutcome() {
+ myReturnMethodOutcome = true;
+ return this;
+ }
+
@SuppressWarnings("unchecked")
@Override
public IOperationProcessMsgMode setMessageBundle(IBaseBundle theMsgBundle) {
@@ -1331,10 +1314,30 @@ public class GenericClient extends BaseClient implements IGenericClient {
}
+
+ private final class MethodOutcomeResponseHandler implements IClientResponseHandler {
+ private final IClientResponseHandler myWrap;
+
+ private MethodOutcomeResponseHandler(IClientResponseHandler theWrap) {
+ myWrap = theWrap;
+ }
+
+ @Override
+ public MethodOutcome invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException {
+ IBaseResource response = myWrap.invokeClient(theResponseMimeType, theResponseInputStream, theResponseStatusCode, theHeaders);
+
+ MethodOutcome retVal = new MethodOutcome();
+ retVal.setResource(response);
+ retVal.setCreatedUsingStatusCode(theResponseStatusCode);
+ retVal.setResponseHeaders(theHeaders);
+ return retVal;
+ }
+ }
+
private final class OperationOutcomeResponseHandler implements IClientResponseHandler {
@Override
- public IBaseOperationOutcome invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders)
+ public IBaseOperationOutcome invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders)
throws BaseServerResponseException {
EncodingEnum respType = EncodingEnum.forContentType(theResponseMimeType);
if (respType == null) {
@@ -1344,7 +1347,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
IBaseOperationOutcome retVal;
try {
// TODO: handle if something else than OO comes back
- retVal = (IBaseOperationOutcome) parser.parseResource(theResponseReader);
+ retVal = (IBaseOperationOutcome) parser.parseResource(theResponseInputStream);
} catch (DataFormatException e) {
ourLog.warn("Failed to parse OperationOutcome response", e);
return null;
@@ -1368,11 +1371,9 @@ public class GenericClient extends BaseClient implements IGenericClient {
}
@Override
- public MethodOutcome invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws BaseServerResponseException {
- MethodOutcome response = MethodUtil.process2xxResponse(myContext, theResponseStatusCode, theResponseMimeType, theResponseReader, theHeaders);
- if (theResponseStatusCode == Constants.STATUS_HTTP_201_CREATED) {
- response.setCreated(true);
- }
+ public MethodOutcome invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders) throws BaseServerResponseException {
+ MethodOutcome response = MethodUtil.process2xxResponse(myContext, theResponseStatusCode, theResponseMimeType, theResponseInputStream, theHeaders);
+ response.setCreatedUsingStatusCode(theResponseStatusCode);
if (myPrefer == PreferReturnEnum.REPRESENTATION) {
if (response.getResource() == null) {
@@ -1384,6 +1385,8 @@ public class GenericClient extends BaseClient implements IGenericClient {
}
}
+ response.setResponseHeaders(theHeaders);
+
return response;
}
}
@@ -1511,9 +1514,9 @@ public class GenericClient extends BaseClient implements IGenericClient {
@Override
public Object execute() {// AAA
if (myId.hasVersionIdPart()) {
- return doReadOrVRead(myType.getImplementingClass(), myId, true, myNotModifiedHandler, myIfVersionMatches, myPrettyPrint, mySummaryMode, myParamEncoding, getSubsetElements());
+ return doReadOrVRead(myType.getImplementingClass(), myId, true, myNotModifiedHandler, myIfVersionMatches, myPrettyPrint, mySummaryMode, myParamEncoding, getSubsetElements(), getCustomAcceptHeaderValue());
}
- return doReadOrVRead(myType.getImplementingClass(), myId, false, myNotModifiedHandler, myIfVersionMatches, myPrettyPrint, mySummaryMode, myParamEncoding, getSubsetElements());
+ return doReadOrVRead(myType.getImplementingClass(), myId, false, myNotModifiedHandler, myIfVersionMatches, myPrettyPrint, mySummaryMode, myParamEncoding, getSubsetElements(), getCustomAcceptHeaderValue());
}
@Override
@@ -1636,11 +1639,11 @@ public class GenericClient extends BaseClient implements IGenericClient {
@SuppressWarnings("unchecked")
@Override
- public List invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders)
+ public List invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders)
throws BaseServerResponseException {
Class bundleType = myContext.getResourceDefinition("Bundle").getImplementingClass();
- ResourceResponseHandler handler = new ResourceResponseHandler((Class) bundleType);
- IBaseResource response = handler.invokeClient(theResponseMimeType, theResponseReader, theResponseStatusCode, theHeaders);
+ ResourceResponseHandler handler = new ResourceResponseHandler<>((Class) bundleType);
+ IBaseResource response = handler.invokeClient(theResponseMimeType, theResponseInputStream, theResponseStatusCode, theHeaders);
IVersionSpecificBundleFactory bundleFactory = myContext.newBundleFactory();
bundleFactory.initializeWithBundleResource(response);
return bundleFactory.toListOfResources();
@@ -1937,9 +1940,9 @@ public class GenericClient extends BaseClient implements IGenericClient {
private final class StringResponseHandler implements IClientResponseHandler {
@Override
- public String invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders)
+ public String invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders)
throws IOException, BaseServerResponseException {
- return IOUtils.toString(theResponseReader);
+ return IOUtils.toString(theResponseInputStream, Charsets.UTF_8);
}
}
@@ -2251,4 +2254,47 @@ public class GenericClient extends BaseClient implements IGenericClient {
}
+ private static void addParam(Map> params, String parameterName, String parameterValue) {
+ if (!params.containsKey(parameterName)) {
+ params.put(parameterName, new ArrayList<>());
+ }
+ params.get(parameterName).add(parameterValue);
+ }
+
+ private static void addPreferHeader(PreferReturnEnum thePrefer, BaseHttpClientInvocation theInvocation) {
+ if (thePrefer != null) {
+ theInvocation.addHeader(Constants.HEADER_PREFER, Constants.HEADER_PREFER_RETURN + '=' + thePrefer.getHeaderValue());
+ }
+ }
+
+ private static String validateAndEscapeConditionalUrl(String theSearchUrl) {
+ Validate.notBlank(theSearchUrl, "Conditional URL can not be blank/null");
+ StringBuilder b = new StringBuilder();
+ boolean haveHadQuestionMark = false;
+ for (int i = 0; i < theSearchUrl.length(); i++) {
+ char nextChar = theSearchUrl.charAt(i);
+ if (!haveHadQuestionMark) {
+ if (nextChar == '?') {
+ haveHadQuestionMark = true;
+ } else if (!Character.isLetter(nextChar)) {
+ throw new IllegalArgumentException("Conditional URL must be in the format \"[ResourceType]?[Params]\" and must not have a base URL - Found: " + theSearchUrl);
+ }
+ b.append(nextChar);
+ } else {
+ switch (nextChar) {
+ case '|':
+ case '?':
+ case '$':
+ case ':':
+ b.append(UrlUtil.escapeUrlParam(Character.toString(nextChar)));
+ break;
+ default:
+ b.append(nextChar);
+ break;
+ }
+ }
+ }
+ return b.toString();
+ }
+
}
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseMethodBinding.java
index 490ee770028..aaee9568521 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseMethodBinding.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseMethodBinding.java
@@ -21,6 +21,7 @@ package ca.uhn.fhir.rest.client.method;
*/
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.Method;
import java.util.*;
@@ -71,11 +72,11 @@ public abstract class BaseMethodBinding implements IClientResponseHandler
}
- protected IParser createAppropriateParserForParsingResponse(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, List> thePreferTypes) {
+ protected IParser createAppropriateParserForParsingResponse(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, List> thePreferTypes) {
EncodingEnum encoding = EncodingEnum.forContentType(theResponseMimeType);
if (encoding == null) {
- NonFhirResponseException ex = NonFhirResponseException.newInstance(theResponseStatusCode, theResponseMimeType, theResponseReader);
- populateException(ex, theResponseReader);
+ NonFhirResponseException ex = NonFhirResponseException.newInstance(theResponseStatusCode, theResponseMimeType, theResponseInputStream);
+ populateException(ex, theResponseInputStream);
throw ex;
}
@@ -139,7 +140,7 @@ public abstract class BaseMethodBinding implements IClientResponseHandler
return mySupportsConditionalMultiple;
}
- protected BaseServerResponseException processNon2xxResponseAndReturnExceptionToThrow(int theStatusCode, String theResponseMimeType, Reader theResponseReader) {
+ protected BaseServerResponseException processNon2xxResponseAndReturnExceptionToThrow(int theStatusCode, String theResponseMimeType, InputStream theResponseInputStream) {
BaseServerResponseException ex;
switch (theStatusCode) {
case Constants.STATUS_HTTP_400_BAD_REQUEST:
@@ -158,9 +159,9 @@ public abstract class BaseMethodBinding implements IClientResponseHandler
ex = new PreconditionFailedException("Server responded with HTTP 412");
break;
case Constants.STATUS_HTTP_422_UNPROCESSABLE_ENTITY:
- IParser parser = createAppropriateParserForParsingResponse(theResponseMimeType, theResponseReader, theStatusCode, null);
+ IParser parser = createAppropriateParserForParsingResponse(theResponseMimeType, theResponseInputStream, theStatusCode, null);
// TODO: handle if something other than OO comes back
- BaseOperationOutcome operationOutcome = (BaseOperationOutcome) parser.parseResource(theResponseReader);
+ BaseOperationOutcome operationOutcome = (BaseOperationOutcome) parser.parseResource(theResponseInputStream);
ex = new UnprocessableEntityException(myContext, operationOutcome);
break;
default:
@@ -168,7 +169,7 @@ public abstract class BaseMethodBinding implements IClientResponseHandler
break;
}
- populateException(ex, theResponseReader);
+ populateException(ex, theResponseInputStream);
return ex;
}
@@ -322,9 +323,9 @@ public abstract class BaseMethodBinding implements IClientResponseHandler
return theReturnTypeFromMethod.equals(IBaseResource.class) || theReturnTypeFromMethod.equals(IResource.class) || theReturnTypeFromMethod.equals(IAnyResource.class);
}
- private static void populateException(BaseServerResponseException theEx, Reader theResponseReader) {
+ private static void populateException(BaseServerResponseException theEx, InputStream theResponseInputStream) {
try {
- String responseText = IOUtils.toString(theResponseReader);
+ String responseText = IOUtils.toString(theResponseInputStream);
theEx.setResponseBody(responseText);
} catch (IOException e) {
ourLog.debug("Failed to read response", e);
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBinding.java
index 19614ef676b..332ba6f7ddb 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBinding.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBinding.java
@@ -20,6 +20,7 @@ package ca.uhn.fhir.rest.client.method;
* #L%
*/
+import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.Method;
import java.util.*;
@@ -68,15 +69,15 @@ abstract class BaseOutcomeReturningMethodBinding extends BaseMethodBinding> theHeaders) throws BaseServerResponseException {
+ public MethodOutcome invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders) throws BaseServerResponseException {
if (theResponseStatusCode >= 200 && theResponseStatusCode < 300) {
if (myReturnVoid) {
return null;
}
- MethodOutcome retVal = MethodUtil.process2xxResponse(getContext(), theResponseStatusCode, theResponseMimeType, theResponseReader, theHeaders);
+ MethodOutcome retVal = MethodUtil.process2xxResponse(getContext(), theResponseStatusCode, theResponseMimeType, theResponseInputStream, theHeaders);
return retVal;
}
- throw processNon2xxResponseAndReturnExceptionToThrow(theResponseStatusCode, theResponseMimeType, theResponseReader);
+ throw processNon2xxResponseAndReturnExceptionToThrow(theResponseStatusCode, theResponseMimeType, theResponseInputStream);
}
public boolean isReturnVoid() {
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseResourceReturningMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseResourceReturningMethodBinding.java
index 0286a09b5e6..b4d2280c4fb 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseResourceReturningMethodBinding.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseResourceReturningMethodBinding.java
@@ -20,6 +20,8 @@ package ca.uhn.fhir.rest.client.method;
* #L%
*/
+import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -123,21 +125,21 @@ public abstract class BaseResourceReturningMethodBinding extends BaseMethodBindi
public abstract ReturnTypeEnum getReturnType();
@Override
- public Object invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) {
+ public Object invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders) throws IOException {
if (Constants.STATUS_HTTP_204_NO_CONTENT == theResponseStatusCode) {
return toReturnType(null);
}
- IParser parser = createAppropriateParserForParsingResponse(theResponseMimeType, theResponseReader, theResponseStatusCode, myPreferTypesList);
+ IParser parser = createAppropriateParserForParsingResponse(theResponseMimeType, theResponseInputStream, theResponseStatusCode, myPreferTypesList);
switch (getReturnType()) {
case BUNDLE: {
- IBaseBundle bundle = null;
- List listOfResources = null;
+ IBaseBundle bundle;
+ List listOfResources;
Class type = getContext().getResourceDefinition("Bundle").getImplementingClass();
- bundle = (IBaseBundle) parser.parseResource(type, theResponseReader);
+ bundle = (IBaseBundle) parser.parseResource(type, theResponseInputStream);
listOfResources = BundleUtil.toListOfResources(getContext(), bundle);
switch (getMethodReturnType()) {
@@ -171,9 +173,9 @@ public abstract class BaseResourceReturningMethodBinding extends BaseMethodBindi
case RESOURCE: {
IBaseResource resource;
if (myResourceType != null) {
- resource = parser.parseResource(myResourceType, theResponseReader);
+ resource = parser.parseResource(myResourceType, theResponseInputStream);
} else {
- resource = parser.parseResource(theResponseReader);
+ resource = parser.parseResource(theResponseInputStream);
}
MethodUtil.parseClientRequestResourceHeaders(null, theHeaders, resource);
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandler.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandler.java
index 65437ee2d5e..dccaaac6c8a 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandler.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandler.java
@@ -21,6 +21,7 @@ package ca.uhn.fhir.rest.client.method;
*/
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.util.List;
import java.util.Map;
@@ -29,6 +30,6 @@ import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
public interface IClientResponseHandler {
- T invokeClient(String theResponseMimeType, Reader theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException;
+ T invokeClient(String theResponseMimeType, InputStream theResponseInputStream, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException;
}
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandlerHandlesBinary.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandlerHandlesBinary.java
index ad16c57d11b..64a947b2a82 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandlerHandlesBinary.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandlerHandlesBinary.java
@@ -35,6 +35,6 @@ public interface IClientResponseHandlerHandlesBinary extends IClientResponseH
*/
boolean isBinary();
- T invokeClient(String theResponseMimeType, InputStream theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException;
+ T invokeClientForBinary(String theResponseMimeType, InputStream theResponseReader, int theResponseStatusCode, Map> theHeaders) throws IOException, BaseServerResponseException;
}
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/MethodUtil.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/MethodUtil.java
index 486158974b9..94a26d60a40 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/MethodUtil.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/MethodUtil.java
@@ -49,15 +49,6 @@ import ca.uhn.fhir.util.*;
public class MethodUtil {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(MethodUtil.class);
- private static final Set ourServletRequestTypes = new HashSet();
- private static final Set ourServletResponseTypes = new HashSet();
-
- static {
- ourServletRequestTypes.add("javax.servlet.ServletRequest");
- ourServletResponseTypes.add("javax.servlet.ServletResponse");
- ourServletRequestTypes.add("javax.servlet.http.HttpServletRequest");
- ourServletResponseTypes.add("javax.servlet.http.HttpServletResponse");
- }
/** Non instantiable */
private MethodUtil() {
@@ -497,8 +488,8 @@ public class MethodUtil {
}
public static MethodOutcome process2xxResponse(FhirContext theContext, int theResponseStatusCode,
- String theResponseMimeType, Reader theResponseReader, Map> theHeaders) {
- List locationHeaders = new ArrayList();
+ String theResponseMimeType, InputStream theResponseReader, Map> theHeaders) {
+ List locationHeaders = new ArrayList<>();
List lh = theHeaders.get(Constants.HEADER_LOCATION_LC);
if (lh != null) {
locationHeaders.addAll(lh);
@@ -509,14 +500,14 @@ public class MethodUtil {
}
MethodOutcome retVal = new MethodOutcome();
- if (locationHeaders != null && locationHeaders.size() > 0) {
+ if (locationHeaders.size() > 0) {
String locationHeader = locationHeaders.get(0);
BaseOutcomeReturningMethodBinding.parseContentLocation(theContext, retVal, locationHeader);
}
if (theResponseStatusCode != Constants.STATUS_HTTP_204_NO_CONTENT) {
EncodingEnum ct = EncodingEnum.forContentType(theResponseMimeType);
if (ct != null) {
- PushbackReader reader = new PushbackReader(theResponseReader);
+ PushbackInputStream reader = new PushbackInputStream(theResponseReader);
try {
int firstByte = reader.read();
diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ReadMethodBinding.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ReadMethodBinding.java
index 536663c0294..24a7e163a7e 100644
--- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ReadMethodBinding.java
+++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ReadMethodBinding.java
@@ -106,7 +106,7 @@ public class ReadMethodBinding extends BaseResourceReturningMethodBinding implem
}
@Override
- public Object invokeClient(String theResponseMimeType, InputStream theResponseReader, int theResponseStatusCode, Map> theHeaders)
+ public Object invokeClientForBinary(String theResponseMimeType, InputStream theResponseReader, int theResponseStatusCode, Map> theHeaders)
throws IOException, BaseServerResponseException {
byte[] contents = IOUtils.toByteArray(theResponseReader);
diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml
index 75475bbddf6..c2795fa0544 100644
--- a/hapi-fhir-converter/pom.xml
+++ b/hapi-fhir-converter/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 3.6.0
+ 3.7.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
@@ -16,14 +16,14 @@
ca.uhn.hapi.fhir
hapi-fhir-base
- 3.6.0
+ 3.7.0-SNAPSHOT
ca.uhn.hapi.fhir
hapi-fhir-server
- 3.6.0
+ 3.7.0-SNAPSHOT
true
@@ -35,43 +35,43 @@
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2
- 3.6.0
+ 3.7.0-SNAPSHOT
true
ca.uhn.hapi.fhir
hapi-fhir-structures-hl7org-dstu2
- 3.6.0
+ 3.7.0-SNAPSHOT
true
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu2.1
- 3.6.0
+ 3.7.0-SNAPSHOT
true
ca.uhn.hapi.fhir
hapi-fhir-structures-dstu3
- 3.6.0
+ 3.7.0-SNAPSHOT
true
ca.uhn.hapi.fhir
hapi-fhir-structures-r4
- 3.6.0
+ 3.7.0-SNAPSHOT
true
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu2
- 3.6.0
+ 3.7.0-SNAPSHOT
true
ca.uhn.hapi.fhir
hapi-fhir-validation-resources-dstu3
- 3.6.0
+ 3.7.0-SNAPSHOT
true
diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
index d3f54365643..29d4c168a93 100644
--- a/hapi-fhir-dist/pom.xml
+++ b/hapi-fhir-dist/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 3.6.0
+ 3.7.0-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-igpacks/pom.xml b/hapi-fhir-igpacks/pom.xml
index 861ba601ded..c234ef248ec 100644
--- a/hapi-fhir-igpacks/pom.xml
+++ b/hapi-fhir-igpacks/pom.xml
@@ -5,7 +5,7 @@
hapi-deployable-pom
ca.uhn.hapi.fhir
- 3.6.0
+ 3.7.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
4.0.0
diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml
index 7f4befcb6da..fe5524cb1f5 100644
--- a/hapi-fhir-jacoco/pom.xml
+++ b/hapi-fhir-jacoco/pom.xml
@@ -11,7 +11,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 3.6.0
+ 3.7.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-jaxrsserver-base/pom.xml b/hapi-fhir-jaxrsserver-base/pom.xml
index 5df5cad341f..4473c315915 100644
--- a/hapi-fhir-jaxrsserver-base/pom.xml
+++ b/hapi-fhir-jaxrsserver-base/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 3.6.0
+ 3.7.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpRequest.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpRequest.java
index c2cb7eeed86..654a4c52d85 100644
--- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpRequest.java
+++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpRequest.java
@@ -85,6 +85,11 @@ public class JaxRsHttpRequest implements IHttpRequest {
return myRequestType.name();
}
+ @Override
+ public void removeHeaders(String theHeaderName) {
+ myHeaders.remove(theHeaderName);
+ }
+
/**
* Get the Request
*
diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpResponse.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpResponse.java
index 1212d6e7481..ea9069cf23b 100644
--- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpResponse.java
+++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpResponse.java
@@ -1,6 +1,6 @@
package ca.uhn.fhir.jaxrs.client;
-import java.io.IOException;
+import java.io.*;
/*
* #%L
@@ -22,9 +22,6 @@ import java.io.IOException;
* #L%
*/
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -34,9 +31,11 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import ca.uhn.fhir.rest.client.impl.BaseHttpResponse;
+import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.util.StopWatch;
import ca.uhn.fhir.rest.client.api.IHttpResponse;
+import org.apache.commons.io.IOUtils;
/**
* A Http Response based on JaxRs. This is an adapter around the class {@link javax.ws.rs.core.Response Response}
@@ -118,7 +117,11 @@ public class JaxRsHttpResponse extends BaseHttpResponse implements IHttpResponse
@Override
public InputStream readEntity() {
- return myResponse.readEntity(java.io.InputStream.class);
+ if (!myBufferedEntity && !myResponse.hasEntity()) {
+ return new ByteArrayInputStream(new byte[0]);
+ } else {
+ return new ByteArrayInputStream(myResponse.readEntity(byte[].class));
+ }
}
@Override
diff --git a/hapi-fhir-jaxrsserver-example/pom.xml b/hapi-fhir-jaxrsserver-example/pom.xml
index a3a7f0ee5f8..62b224a986d 100644
--- a/hapi-fhir-jaxrsserver-example/pom.xml
+++ b/hapi-fhir-jaxrsserver-example/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 3.6.0
+ 3.7.0-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index f14480d8925..70d625d3b3b 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 3.6.0
+ 3.7.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
@@ -163,7 +163,7 @@
org.thymeleaf
- thymeleaf-spring4
+ thymeleaf-spring5
@@ -670,7 +670,7 @@
maven-surefire-plugin
alphabetical
- @{argLine} -Dfile.encoding=UTF-8 -Xmx1024m
+ @{argLine} -Dfile.encoding=UTF-8 -Xmx20484M -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC
0.6C
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java
index 9667e2ba924..2a707982a22 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java
@@ -1,5 +1,35 @@
package ca.uhn.fhir.jpa.config;
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.i18n.HapiLocalizer;
+import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider;
+import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
+import ca.uhn.fhir.jpa.search.IStaleSearchDeletingSvc;
+import ca.uhn.fhir.jpa.search.StaleSearchDeletingSvcImpl;
+import ca.uhn.fhir.jpa.search.reindex.IResourceReindexingSvc;
+import ca.uhn.fhir.jpa.search.reindex.ResourceReindexingSvcImpl;
+import ca.uhn.fhir.jpa.subscription.email.SubscriptionEmailInterceptor;
+import ca.uhn.fhir.jpa.subscription.resthook.SubscriptionRestHookInterceptor;
+import ca.uhn.fhir.jpa.subscription.websocket.SubscriptionWebsocketInterceptor;
+import org.hibernate.jpa.HibernatePersistenceProvider;
+import org.springframework.beans.factory.annotation.Autowire;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.*;
+import org.springframework.core.env.Environment;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaDialect;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
+import org.springframework.scheduling.concurrent.ScheduledExecutorFactoryBean;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+
+import javax.annotation.Nonnull;
+
/*
* #%L
* HAPI FHIR JPA Server
@@ -20,46 +50,14 @@ package ca.uhn.fhir.jpa.config;
* #L%
*/
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.i18n.HapiLocalizer;
-import ca.uhn.fhir.jpa.dao.DaoRegistry;
-import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider;
-import ca.uhn.fhir.jpa.search.*;
-import ca.uhn.fhir.jpa.search.reindex.IResourceReindexingSvc;
-import ca.uhn.fhir.jpa.search.reindex.ResourceReindexingSvcImpl;
-import ca.uhn.fhir.jpa.search.warm.CacheWarmingSvcImpl;
-import ca.uhn.fhir.jpa.search.warm.ICacheWarmingSvc;
-import ca.uhn.fhir.jpa.sp.ISearchParamPresenceSvc;
-import ca.uhn.fhir.jpa.sp.SearchParamPresenceSvcImpl;
-import ca.uhn.fhir.jpa.subscription.email.SubscriptionEmailInterceptor;
-import ca.uhn.fhir.jpa.subscription.resthook.SubscriptionRestHookInterceptor;
-import ca.uhn.fhir.jpa.subscription.websocket.SubscriptionWebsocketInterceptor;
-import org.hibernate.jpa.HibernatePersistenceProvider;
-import org.springframework.beans.factory.annotation.Autowire;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.env.Environment;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.hibernate5.HibernateExceptionTranslator;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaDialect;
-import org.springframework.scheduling.TaskScheduler;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
-import org.springframework.scheduling.concurrent.ScheduledExecutorFactoryBean;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-
-import javax.annotation.Nonnull;
-import java.util.concurrent.ScheduledExecutorService;
-
@Configuration
@EnableScheduling
@EnableJpaRepositories(basePackages = "ca.uhn.fhir.jpa.dao.data")
+@ComponentScan(basePackages = "ca.uhn.fhir.jpa", excludeFilters={
+ @ComponentScan.Filter(type=FilterType.ASSIGNABLE_TYPE, value=BaseConfig.class),
+ @ComponentScan.Filter(type=FilterType.ASSIGNABLE_TYPE, value=WebSocketConfigurer.class)})
+
public abstract class BaseConfig implements SchedulingConfigurer {
public static final String TASK_EXECUTOR_NAME = "hapiJpaTaskExecutor";
@@ -67,11 +65,6 @@ public abstract class BaseConfig implements SchedulingConfigurer {
@Autowired
protected Environment myEnv;
- @Bean(name = "myDaoRegistry")
- public DaoRegistry daoRegistry() {
- return new DaoRegistry();
- }
-
@Override
public void configureTasks(@Nonnull ScheduledTaskRegistrar theTaskRegistrar) {
theTaskRegistrar.setTaskScheduler(taskScheduler());
@@ -95,27 +88,12 @@ public abstract class BaseConfig implements SchedulingConfigurer {
public abstract FhirContext fhirContext();
- @Bean
- public ICacheWarmingSvc cacheWarmingSvc() {
- return new CacheWarmingSvcImpl();
- }
-
- @Bean
- public HibernateExceptionTranslator hibernateExceptionTranslator() {
- return new HibernateExceptionTranslator();
- }
-
- @Bean
- public HibernateJpaDialect hibernateJpaDialectInstance() {
- return new HibernateJpaDialect();
- }
-
@Bean()
- public ScheduledExecutorService scheduledExecutorService() {
+ public ScheduledExecutorFactoryBean scheduledExecutorService() {
ScheduledExecutorFactoryBean b = new ScheduledExecutorFactoryBean();
b.setPoolSize(5);
b.afterPropertiesSet();
- return b.getObject();
+ return b;
}
@Bean(name = "mySubscriptionTriggeringProvider")
@@ -124,17 +102,28 @@ public abstract class BaseConfig implements SchedulingConfigurer {
return new SubscriptionTriggeringProvider();
}
- @Bean(autowire = Autowire.BY_TYPE, name = "mySearchCoordinatorSvc")
- public ISearchCoordinatorSvc searchCoordinatorSvc() {
- return new SearchCoordinatorSvcImpl();
+ @Bean()
+ public TaskScheduler taskScheduler() {
+ ConcurrentTaskScheduler retVal = new ConcurrentTaskScheduler();
+ retVal.setConcurrentExecutor(scheduledExecutorService().getObject());
+ retVal.setScheduledExecutor(scheduledExecutorService().getObject());
+ return retVal;
+ }
+
+ @Bean(name = TASK_EXECUTOR_NAME)
+ public AsyncTaskExecutor taskExecutor() {
+ ConcurrentTaskScheduler retVal = new ConcurrentTaskScheduler();
+ retVal.setConcurrentExecutor(scheduledExecutorService().getObject());
+ retVal.setScheduledExecutor(scheduledExecutorService().getObject());
+ return retVal;
}
@Bean
- public ISearchParamPresenceSvc searchParamPresenceSvc() {
- return new SearchParamPresenceSvcImpl();
+ public IResourceReindexingSvc resourceReindexingSvc() {
+ return new ResourceReindexingSvcImpl();
}
- @Bean(autowire = Autowire.BY_TYPE)
+ @Bean
public IStaleSearchDeletingSvc staleSearchDeletingSvc() {
return new StaleSearchDeletingSvcImpl();
}
@@ -162,19 +151,6 @@ public abstract class BaseConfig implements SchedulingConfigurer {
return new SubscriptionWebsocketInterceptor();
}
- @Bean(name = TASK_EXECUTOR_NAME)
- public TaskScheduler taskScheduler() {
- ConcurrentTaskScheduler retVal = new ConcurrentTaskScheduler();
- retVal.setConcurrentExecutor(scheduledExecutorService());
- retVal.setScheduledExecutor(scheduledExecutorService());
- return retVal;
- }
-
- @Bean
- public IResourceReindexingSvc resourceReindexingSvc() {
- return new ResourceReindexingSvcImpl();
- }
-
public static void configureEntityManagerFactory(LocalContainerEntityManagerFactoryBean theFactory, FhirContext theCtx) {
theFactory.setJpaDialect(hibernateJpaDialect(theCtx.getLocalizer()));
theFactory.setPackagesToScan("ca.uhn.fhir.jpa.entity");
@@ -184,13 +160,4 @@ public abstract class BaseConfig implements SchedulingConfigurer {
private static HibernateJpaDialect hibernateJpaDialect(HapiLocalizer theLocalizer) {
return new HapiFhirHibernateJpaDialect(theLocalizer);
}
-
- /**
- * This lets the "@Value" fields reference properties from the properties file
- */
- @Bean
- public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
- return new PropertySourcesPlaceholderConfigurer();
- }
-
}
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
index da6135a5456..f700f4179bd 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
@@ -1,126 +1,11 @@
package ca.uhn.fhir.jpa.dao;
-import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.trim;
-
-import java.io.CharArrayWriter;
-import java.text.Normalizer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.annotation.PostConstruct;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.xml.stream.events.Characters;
-import javax.xml.stream.events.XMLEvent;
-
+import ca.uhn.fhir.context.*;
import ca.uhn.fhir.jpa.dao.data.*;
-import org.apache.commons.lang3.NotImplementedException;
-import org.apache.commons.lang3.Validate;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.hibernate.Session;
-import org.hibernate.internal.SessionImpl;
-import org.hl7.fhir.instance.model.api.IAnyResource;
-import org.hl7.fhir.instance.model.api.IBase;
-import org.hl7.fhir.instance.model.api.IBaseCoding;
-import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
-import org.hl7.fhir.instance.model.api.IBaseReference;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.instance.model.api.IDomainResource;
-import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.instance.model.api.IPrimitiveType;
-import org.hl7.fhir.r4.model.BaseResource;
-import org.hl7.fhir.r4.model.Bundle.HTTPVerb;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
-import org.springframework.data.domain.SliceImpl;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.support.TransactionTemplate;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Sets;
-import com.google.common.hash.HashFunction;
-import com.google.common.hash.Hashing;
-
-import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
-import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition;
-import ca.uhn.fhir.context.BaseRuntimeElementDefinition;
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.context.FhirVersionEnum;
-import ca.uhn.fhir.context.RuntimeChildResourceDefinition;
-import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.context.RuntimeSearchParam;
-import ca.uhn.fhir.jpa.dao.index.IndexingSupport;
+import ca.uhn.fhir.jpa.dao.index.IdHelperService;
import ca.uhn.fhir.jpa.dao.index.ResourceIndexedSearchParams;
-import ca.uhn.fhir.jpa.entity.BaseHasResource;
-import ca.uhn.fhir.jpa.entity.BaseTag;
-import ca.uhn.fhir.jpa.entity.ForcedId;
-import ca.uhn.fhir.jpa.entity.IBaseResourceEntity;
-import ca.uhn.fhir.jpa.entity.ResourceEncodingEnum;
-import ca.uhn.fhir.jpa.entity.ResourceHistoryTable;
-import ca.uhn.fhir.jpa.entity.ResourceHistoryTag;
-import ca.uhn.fhir.jpa.entity.ResourceIndexedCompositeStringUnique;
-import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamCoords;
-import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamDate;
-import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamNumber;
-import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamQuantity;
-import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamString;
-import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamToken;
-import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamUri;
-import ca.uhn.fhir.jpa.entity.ResourceLink;
-import ca.uhn.fhir.jpa.entity.ResourceSearchView;
-import ca.uhn.fhir.jpa.entity.ResourceTable;
-import ca.uhn.fhir.jpa.entity.ResourceTag;
-import ca.uhn.fhir.jpa.entity.Search;
-import ca.uhn.fhir.jpa.entity.SearchInclude;
-import ca.uhn.fhir.jpa.entity.SearchParamPresent;
-import ca.uhn.fhir.jpa.entity.SearchResult;
-import ca.uhn.fhir.jpa.entity.SearchStatusEnum;
-import ca.uhn.fhir.jpa.entity.SearchTypeEnum;
-import ca.uhn.fhir.jpa.entity.SubscriptionTable;
-import ca.uhn.fhir.jpa.entity.TagDefinition;
-import ca.uhn.fhir.jpa.entity.TagTypeEnum;
-import ca.uhn.fhir.jpa.entity.TermCodeSystem;
-import ca.uhn.fhir.jpa.entity.TermCodeSystemVersion;
-import ca.uhn.fhir.jpa.entity.TermConcept;
-import ca.uhn.fhir.jpa.entity.TermConceptDesignation;
-import ca.uhn.fhir.jpa.entity.TermConceptMap;
-import ca.uhn.fhir.jpa.entity.TermConceptMapGroup;
-import ca.uhn.fhir.jpa.entity.TermConceptMapGroupElement;
-import ca.uhn.fhir.jpa.entity.TermConceptMapGroupElementTarget;
-import ca.uhn.fhir.jpa.entity.TermConceptParentChildLink;
-import ca.uhn.fhir.jpa.entity.TermConceptProperty;
+import ca.uhn.fhir.jpa.dao.index.SearchParamExtractorService;
+import ca.uhn.fhir.jpa.entity.*;
import ca.uhn.fhir.jpa.search.ISearchCoordinatorSvc;
import ca.uhn.fhir.jpa.search.PersistedJpaBundleProvider;
import ca.uhn.fhir.jpa.sp.ISearchParamPresenceSvc;
@@ -129,8 +14,6 @@ import ca.uhn.fhir.jpa.util.DeleteConflict;
import ca.uhn.fhir.jpa.util.ExpungeOptions;
import ca.uhn.fhir.jpa.util.ExpungeOutcome;
import ca.uhn.fhir.jpa.util.JpaConstants;
-import ca.uhn.fhir.model.api.IQueryParameterAnd;
-import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.model.api.IResource;
import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
import ca.uhn.fhir.model.api.Tag;
@@ -145,25 +28,11 @@ import ca.uhn.fhir.parser.DataFormatException;
import ca.uhn.fhir.parser.IParser;
import ca.uhn.fhir.parser.LenientErrorHandler;
import ca.uhn.fhir.rest.api.Constants;
-import ca.uhn.fhir.rest.api.QualifiedParamList;
import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum;
import ca.uhn.fhir.rest.api.server.IBundleProvider;
import ca.uhn.fhir.rest.api.server.RequestDetails;
-import ca.uhn.fhir.rest.param.DateRangeParam;
-import ca.uhn.fhir.rest.param.ParameterUtil;
-import ca.uhn.fhir.rest.param.StringAndListParam;
-import ca.uhn.fhir.rest.param.StringParam;
-import ca.uhn.fhir.rest.param.TokenAndListParam;
-import ca.uhn.fhir.rest.param.TokenParam;
-import ca.uhn.fhir.rest.param.UriAndListParam;
-import ca.uhn.fhir.rest.param.UriParam;
-import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
-import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
-import ca.uhn.fhir.rest.server.exceptions.MethodNotAllowedException;
-import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
-import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException;
-import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
+import ca.uhn.fhir.rest.server.exceptions.*;
import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor;
import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails;
import ca.uhn.fhir.rest.server.interceptor.IServerOperationInterceptor;
@@ -172,6 +41,45 @@ import ca.uhn.fhir.util.CoverageIgnore;
import ca.uhn.fhir.util.OperationOutcomeUtil;
import ca.uhn.fhir.util.StopWatch;
import ca.uhn.fhir.util.XmlUtil;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Charsets;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hashing;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.commons.lang3.Validate;
+import org.hibernate.Session;
+import org.hibernate.internal.SessionImpl;
+import org.hl7.fhir.instance.model.api.*;
+import org.hl7.fhir.r4.model.Bundle.HTTPVerb;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.persistence.*;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.xml.stream.events.Characters;
+import javax.xml.stream.events.XMLEvent;
+import java.io.CharArrayWriter;
+import java.text.Normalizer;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.apache.commons.lang3.StringUtils.*;
/*
* #%L
@@ -195,7 +103,7 @@ import ca.uhn.fhir.util.XmlUtil;
@SuppressWarnings("WeakerAccess")
@Repository
-public abstract class BaseHapiFhirDao implements IDao, ApplicationContextAware, IndexingSupport {
+public abstract class BaseHapiFhirDao implements IDao, ApplicationContextAware {
public static final long INDEX_STATUS_INDEXED = 1L;
public static final long INDEX_STATUS_INDEXING_FAILED = 2L;
@@ -204,46 +112,17 @@ public abstract class BaseHapiFhirDao implements IDao,
public static final String OO_SEVERITY_INFO = "information";
public static final String OO_SEVERITY_WARN = "warning";
public static final String UCUM_NS = "http://unitsofmeasure.org";
- static final Set EXCLUDE_ELEMENTS_IN_ENCODED;
- /**
- * These are parameters which are supported by {@link BaseHapiFhirResourceDao#searchForIds(SearchParameterMap)}
- */
- static final Map>> RESOURCE_META_AND_PARAMS;
- /**
- * These are parameters which are supported by {@link BaseHapiFhirResourceDao#searchForIds(SearchParameterMap)}
- */
- static final Map> RESOURCE_META_PARAMS;
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(BaseHapiFhirDao.class);
private static final Map ourRetrievalContexts = new HashMap();
private static final String PROCESSING_SUB_REQUEST = "BaseHapiFhirDao.processingSubRequest";
private static boolean ourValidationDisabledForUnitTest;
private static boolean ourDisableIncrementOnUpdateForUnitTest = false;
- static {
- Map> resourceMetaParams = new HashMap>();
- Map>> resourceMetaAndParams = new HashMap>>();
- resourceMetaParams.put(BaseResource.SP_RES_ID, StringParam.class);
- resourceMetaAndParams.put(BaseResource.SP_RES_ID, StringAndListParam.class);
- resourceMetaParams.put(BaseResource.SP_RES_LANGUAGE, StringParam.class);
- resourceMetaAndParams.put(BaseResource.SP_RES_LANGUAGE, StringAndListParam.class);
- resourceMetaParams.put(Constants.PARAM_TAG, TokenParam.class);
- resourceMetaAndParams.put(Constants.PARAM_TAG, TokenAndListParam.class);
- resourceMetaParams.put(Constants.PARAM_PROFILE, UriParam.class);
- resourceMetaAndParams.put(Constants.PARAM_PROFILE, UriAndListParam.class);
- resourceMetaParams.put(Constants.PARAM_SECURITY, TokenParam.class);
- resourceMetaAndParams.put(Constants.PARAM_SECURITY, TokenAndListParam.class);
- RESOURCE_META_PARAMS = Collections.unmodifiableMap(resourceMetaParams);
- RESOURCE_META_AND_PARAMS = Collections.unmodifiableMap(resourceMetaAndParams);
-
- HashSet excludeElementsInEncoded = new HashSet();
- excludeElementsInEncoded.add("id");
- excludeElementsInEncoded.add("*.meta");
- EXCLUDE_ELEMENTS_IN_ENCODED = Collections.unmodifiableSet(excludeElementsInEncoded);
- }
-
@PersistenceContext(type = PersistenceContextType.TRANSACTION)
protected EntityManager myEntityManager;
@Autowired
+ protected IdHelperService myIdHelperService;
+ @Autowired
protected IForcedIdDao myForcedIdDao;
@Autowired
protected ISearchResultDao mySearchResultDao;
@@ -255,6 +134,8 @@ public abstract class BaseHapiFhirDao implements IDao,
protected IResourceIndexedSearchParamStringDao myResourceIndexedSearchParamStringDao;
@Autowired()
protected IResourceIndexedSearchParamTokenDao myResourceIndexedSearchParamTokenDao;
+ @Autowired
+ protected IResourceLinkDao myResourceLinkDao;
@Autowired()
protected IResourceIndexedSearchParamDateDao myResourceIndexedSearchParamDateDao;
@Autowired()
@@ -279,6 +160,8 @@ public abstract class BaseHapiFhirDao implements IDao,
protected IResourceTagDao myResourceTagDao;
@Autowired
protected IResourceSearchViewDao myResourceViewDao;
+ @Autowired
+ protected ISearchParamRegistry mySearchParamRegistry;
@Autowired(required = true)
private DaoConfig myConfig;
private FhirContext myContext;
@@ -290,20 +173,20 @@ public abstract class BaseHapiFhirDao implements IDao,
private ISearchParamExtractor mySearchParamExtractor;
@Autowired
private ISearchParamPresenceSvc mySearchParamPresenceSvc;
- @Autowired
- private ISearchParamRegistry mySearchParamRegistry;
//@Autowired
//private ISearchResultDao mySearchResultDao;
@Autowired
private IResourceIndexedCompositeStringUniqueDao myResourceIndexedCompositeStringUniqueDao;
- private ApplicationContext myApplicationContext;
- private Map, IFhirResourceDao> myResourceTypeToDao;
+ @Autowired
+ private BeanFactory beanFactory;
+ @Autowired
+ private DaoRegistry myDaoRegistry;
+ @Autowired
+ private MatchUrlService myMatchUrlService;
+ @Autowired
+ private SearchParamExtractorService mySearchParamExtractorService;
- public static void clearRequestAsProcessingSubRequest(ServletRequestDetails theRequestDetails) {
- if (theRequestDetails != null) {
- theRequestDetails.getUserData().remove(PROCESSING_SUB_REQUEST);
- }
- }
+ private ApplicationContext myApplicationContext;
/**
* Returns the newly created forced ID. If the entity already had a forced ID, or if
@@ -311,7 +194,7 @@ public abstract class BaseHapiFhirDao implements IDao,
*/
protected ForcedId createForcedIdIfNeeded(ResourceTable theEntity, IIdType theId, boolean theCreateForPureNumericIds) {
if (theId.isEmpty() == false && theId.hasIdPart() && theEntity.getForcedId() == null) {
- if (!theCreateForPureNumericIds && isValidPid(theId)) {
+ if (!theCreateForPureNumericIds && IdHelperService.isValidPid(theId)) {
return null;
}
@@ -328,6 +211,7 @@ public abstract class BaseHapiFhirDao implements IDao,
protected ExpungeOutcome doExpunge(String theResourceName, Long theResourceId, Long theVersion, ExpungeOptions theExpungeOptions) {
TransactionTemplate txTemplate = new TransactionTemplate(myPlatformTransactionManager);
+ txTemplate.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW);
ourLog.info("Expunge: ResourceName[{}] Id[{}] Version[{}] Options[{}]", theResourceName, theResourceId, theVersion, theExpungeOptions);
if (!getConfig().isExpungeEnabled()) {
@@ -367,11 +251,14 @@ public abstract class BaseHapiFhirDao implements IDao,
});
/*
- * Delete any search result cache entries pointing to the given resource
+ * Delete any search result cache entries pointing to the given resource. We do
+ * this in batches to avoid sending giant batches of parameters to the DB
*/
- if (resourceIds.getContent().size() > 0) {
+ List> partitions = Lists.partition(resourceIds.getContent(), 800);
+ for (List nextPartition : partitions) {
+ ourLog.info("Expunging any search results pointing to {} resources", nextPartition.size());
txTemplate.execute(t -> {
- mySearchResultDao.deleteByResourceIds(resourceIds.getContent());
+ mySearchResultDao.deleteByResourceIds(nextPartition);
return null;
});
}
@@ -438,7 +325,7 @@ public abstract class BaseHapiFhirDao implements IDao,
ourLog.info("** BEGINNING GLOBAL $expunge **");
TransactionTemplate txTemplate = new TransactionTemplate(myPlatformTransactionManager);
- txTemplate.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRED);
+ txTemplate.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW);
txTemplate.execute(t -> {
doExpungeEverythingQuery("UPDATE " + ResourceHistoryTable.class.getSimpleName() + " d SET d.myForcedId = null");
doExpungeEverythingQuery("UPDATE " + ResourceTable.class.getSimpleName() + " d SET d.myForcedId = null");
@@ -521,6 +408,8 @@ public abstract class BaseHapiFhirDao implements IDao,
myResourceIndexedSearchParamQuantityDao.deleteAll(resource.getParamsQuantity());
myResourceIndexedSearchParamStringDao.deleteAll(resource.getParamsString());
myResourceIndexedSearchParamTokenDao.deleteAll(resource.getParamsToken());
+ myResourceLinkDao.deleteAll(resource.getResourceLinks());
+ myResourceLinkDao.deleteAll(resource.getResourceLinksAsTarget());
myResourceTagDao.deleteAll(resource.getTags());
resource.getTags().clear();
@@ -529,7 +418,7 @@ public abstract class BaseHapiFhirDao implements IDao,
ForcedId forcedId = resource.getForcedId();
resource.setForcedId(null);
myResourceTableDao.saveAndFlush(resource);
- myForcedIdDao.delete(forcedId);
+ myIdHelperService.delete(forcedId);
}
myResourceTableDao.delete(resource);
@@ -560,7 +449,6 @@ public abstract class BaseHapiFhirDao implements IDao,
}
}
-
private void extractTagsHapi(IResource theResource, ResourceTable theEntity, Set allDefs) {
TagList tagList = ResourceMetadataKeyEnum.TAG_LIST.get(theResource);
if (tagList != null) {
@@ -647,7 +535,7 @@ public abstract class BaseHapiFhirDao implements IDao,
if (theResourceName != null) {
Predicate typePredicate = builder.equal(from.get("myResourceType"), theResourceName);
if (theResourceId != null) {
- cq.where(typePredicate, builder.equal(from.get("myResourceId"), translateForcedIdToPid(theResourceName, theResourceId.getIdPart())));
+ cq.where(typePredicate, builder.equal(from.get("myResourceId"), myIdHelperService.translateForcedIdToPid(theResourceName, theResourceId.getIdPart())));
} else {
cq.where(typePredicate);
}
@@ -659,6 +547,7 @@ public abstract class BaseHapiFhirDao implements IDao,
}
}
}
+
protected void flushJpaSession() {
SessionImpl session = (SessionImpl) myEntityManager.unwrap(Session.class);
int insertionCount = session.getActionQueue().numberOfInsertions();
@@ -679,8 +568,7 @@ public abstract class BaseHapiFhirDao implements IDao,
return retVal;
}
- @Override
- public DaoConfig getConfig() {
+ protected DaoConfig getConfig() {
return myConfig;
}
@@ -710,51 +598,13 @@ public abstract class BaseHapiFhirDao implements IDao,
}
}
- @Override
@SuppressWarnings("unchecked")
public IFhirResourceDao getDao(Class theType) {
- Map, IFhirResourceDao> resourceTypeToDao = getDaos();
- IFhirResourceDao dao = (IFhirResourceDao) resourceTypeToDao.get(theType);
- return dao;
+ return myDaoRegistry.getResourceDaoIfExists(theType);
}
- private Map, IFhirResourceDao> getDaos() {
- if (myResourceTypeToDao == null) {
- Map, IFhirResourceDao> resourceTypeToDao = new HashMap<>();
-
- Map daos = myApplicationContext.getBeansOfType(IFhirResourceDao.class, false, false);
-
- String[] beanNames = myApplicationContext.getBeanNamesForType(IFhirResourceDao.class);
-
- for (IFhirResourceDao next : daos.values()) {
- resourceTypeToDao.put(next.getResourceType(), next);
- }
-
- if (this instanceof IFhirResourceDao) {
- IFhirResourceDao thiz = (IFhirResourceDao) this;
- resourceTypeToDao.put(thiz.getResourceType(), thiz);
- }
-
- myResourceTypeToDao = resourceTypeToDao;
- }
-
- return Collections.unmodifiableMap(myResourceTypeToDao);
- }
-
- @Override
- public IResourceIndexedCompositeStringUniqueDao getResourceIndexedCompositeStringUniqueDao() {
- return myResourceIndexedCompositeStringUniqueDao;
- }
-
- @Override
- public RuntimeSearchParam getSearchParamByName(RuntimeResourceDefinition theResourceDef, String theParamName) {
- Map params = mySearchParamRegistry.getActiveSearchParams(theResourceDef.getName());
- return params.get(theParamName);
- }
-
- @Override
- public Collection getSearchParamsByResourceType(RuntimeResourceDefinition theResourceDef) {
- return mySearchParamRegistry.getActiveSearchParams(theResourceDef.getName()).values();
+ protected IFhirResourceDao getDaoOrThrowException(Class theClass) {
+ return myDaoRegistry.getDaoOrThrowException(theClass);
}
protected TagDefinition getTagOrNull(TagTypeEnum theTagType, String theScheme, String theTerm, String theLabel) {
@@ -892,39 +742,13 @@ public abstract class BaseHapiFhirDao implements IDao,
theProvider.setSearchCoordinatorSvc(mySearchCoordinatorSvc);
}
- @Override
public boolean isLogicalReference(IIdType theId) {
- Set treatReferencesAsLogical = myConfig.getTreatReferencesAsLogical();
- if (treatReferencesAsLogical != null) {
- for (String nextLogicalRef : treatReferencesAsLogical) {
- nextLogicalRef = trim(nextLogicalRef);
- if (nextLogicalRef.charAt(nextLogicalRef.length() - 1) == '*') {
- if (theId.getValue().startsWith(nextLogicalRef.substring(0, nextLogicalRef.length() - 1))) {
- return true;
- }
- } else {
- if (theId.getValue().equals(nextLogicalRef)) {
- return true;
- }
- }
- }
-
- }
- return false;
- }
-
- public static void markRequestAsProcessingSubRequest(ServletRequestDetails theRequestDetails) {
- if (theRequestDetails != null) {
- theRequestDetails.getUserData().put(PROCESSING_SUB_REQUEST, Boolean.TRUE);
- }
+ return LogicalReferenceHelper.isLogicalReference(myConfig, theId);
}
@Override
public SearchBuilder newSearchBuilder() {
- SearchBuilder builder = new SearchBuilder(
- getContext(), myEntityManager, myFulltextSearchSvc, this, myResourceIndexedSearchParamUriDao,
- myForcedIdDao, myTerminologySvc, mySerarchParamRegistry, myResourceTagDao, myResourceViewDao);
- return builder;
+ return beanFactory.getBean(SearchBuilder.class, this);
}
public void notifyInterceptors(RestOperationTypeEnum theOperationType, ActionRequestDetails theRequestDetails) {
@@ -944,34 +768,6 @@ public abstract class BaseHapiFhirDao implements IDao,
}
}
- public String parseContentTextIntoWords(IBaseResource theResource) {
- StringBuilder retVal = new StringBuilder();
- @SuppressWarnings("rawtypes")
- List childElements = getContext().newTerser().getAllPopulatedChildElementsOfType(theResource, IPrimitiveType.class);
- for (@SuppressWarnings("rawtypes")
- IPrimitiveType nextType : childElements) {
- if (nextType instanceof StringDt || nextType.getClass().getSimpleName().equals("StringType")) {
- String nextValue = nextType.getValueAsString();
- if (isNotBlank(nextValue)) {
- retVal.append(nextValue.replace("\n", " ").replace("\r", " "));
- retVal.append("\n");
- }
- }
- }
- return retVal.toString();
- }
-
- @Override
- public void populateFullTextFields(final IBaseResource theResource, ResourceTable theEntity) {
- if (theEntity.getDeleted() != null) {
- theEntity.setNarrativeTextParsedIntoWords(null);
- theEntity.setContentTextParsedIntoWords(null);
- } else {
- theEntity.setNarrativeTextParsedIntoWords(parseNarrativeTextIntoWords(theResource));
- theEntity.setContentTextParsedIntoWords(parseContentTextIntoWords(theResource));
- }
- }
-
private void populateResourceIdFromEntity(IBaseResourceEntity theEntity, final IBaseResource theResource) {
IIdType id = theEntity.getIdDt();
if (getContext().getVersion().getVersion().isRi()) {
@@ -1006,7 +802,7 @@ public abstract class BaseHapiFhirDao