true (default is false), the values supplied
+ * to {@link #setEncodeElements(Set)} will not be applied to the root
+ * resource (typically a Bundle), but will be applied to any sub-resources
+ * contained within it (i.e. search result resources in that bundle)
+ */
+ void setEncodeElementsAppliesToChildResourcesOnly(boolean theEncodeElementsAppliesToChildResourcesOnly);
+
+ /**
+ * If set to true (default is false), the values supplied
+ * to {@link #setEncodeElements(Set)} will not be applied to the root
+ * resource (typically a Bundle), but will be applied to any sub-resources
+ * contained within it (i.e. search result resources in that bundle)
+ */
+ boolean isEncodeElementsAppliesToChildResourcesOnly();
+
/**
* If provided, tells the parse which resource types to apply {@link #setEncodeElements(Set) encode elements} to. Any
* resource types not specified here will be encoded completely, with no elements excluded.
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
index 55aa0bc7a7a..f759cefa6cd 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
@@ -19,19 +19,6 @@ package ca.uhn.fhir.parser;
* limitations under the License.
* #L%
*/
-import static org.apache.commons.lang3.StringUtils.*;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.util.*;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.apache.commons.lang3.text.WordUtils;
-import org.hl7.fhir.instance.model.api.*;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import ca.uhn.fhir.context.*;
import ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum;
@@ -46,9 +33,27 @@ import ca.uhn.fhir.parser.json.*;
import ca.uhn.fhir.parser.json.JsonLikeValue.ScalarType;
import ca.uhn.fhir.parser.json.JsonLikeValue.ValueType;
import ca.uhn.fhir.rest.api.EncodingEnum;
+import ca.uhn.fhir.util.BinaryUtil;
import ca.uhn.fhir.util.ElementUtil;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.text.WordUtils;
+import org.hl7.fhir.instance.model.api.*;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
import static ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum.ID_DATATYPE;
import static ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum.PRIMITIVE_DATATYPE;
+import static org.apache.commons.lang3.StringUtils.*;
/**
* This class is the FHIR JSON parser/encoder. Users should not interact with this class directly, but should use
@@ -88,7 +93,7 @@ public class JsonParser extends BaseParser implements IJsonLikeParser {
}
private boolean addToHeldExtensions(int valueIdx, List> ext, ArrayListCache-Control header called max-results=123
+ * specified the maximum number of results which will be fetched from the
+ * database before returning.
+ */
+ public Integer getMaxResults() {
+ return myMaxResults;
+ }
+
+ /**
+ * If the {@link #isNoStore() no-store} directive is set, this HAPI FHIR extention
+ * to the Cache-Control header called max-results=123
+ * specified the maximum number of results which will be fetched from the
+ * database before returning.
+ */
+ public CacheControlDirective setMaxResults(Integer theMaxResults) {
+ myMaxResults = theMaxResults;
+ return this;
+ }
+
+ /**
+ * If true<, adds the no-cache directive to the
+ * request. This directive indicates that the cache should not be used to
+ * serve this request.
+ */
+ public boolean isNoCache() {
+ return myNoCache;
+ }
+
+ /**
+ * If true<, adds the no-cache directive to the
+ * request. This directive indicates that the cache should not be used to
+ * serve this request.
+ */
+ public CacheControlDirective setNoCache(boolean theNoCache) {
+ myNoCache = theNoCache;
+ return this;
+ }
+
+ public boolean isNoStore() {
+ return myNoStore;
+ }
+
+ public CacheControlDirective setNoStore(boolean theNoStore) {
+ myNoStore = theNoStore;
+ return this;
+ }
+
+ /**
+ * Parses a list of Cache-Control header values
+ *
+ * @param theValues The Cache-Control header values
+ */
+ public CacheControlDirective parse(ListCache-Control header value, which advises the server (or any cache in front of it)
+ * how to behave in terms of cached requests
+ */
+ T cacheControl(CacheControlDirective theCacheControlDirective);
+
/**
* 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
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BinaryUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BinaryUtil.java
new file mode 100644
index 00000000000..b6c4411c8f3
--- /dev/null
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/BinaryUtil.java
@@ -0,0 +1,47 @@
+package ca.uhn.fhir.util;
+
+import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
+import ca.uhn.fhir.context.BaseRuntimeElementDefinition;
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.context.RuntimeResourceDefinition;
+import org.hl7.fhir.instance.model.api.IBase;
+import org.hl7.fhir.instance.model.api.IBaseBinary;
+import org.hl7.fhir.instance.model.api.IBaseReference;
+
+import java.util.List;
+
+public class BinaryUtil {
+
+ private BinaryUtil() {
+ // non instantiable
+ }
+
+ public static IBaseReference getSecurityContext(FhirContext theCtx, IBaseBinary theBinary) {
+ RuntimeResourceDefinition def = theCtx.getResourceDefinition("Binary");
+ BaseRuntimeChildDefinition child = def.getChildByName("securityContext");
+ IBaseReference retVal = null;
+ if (child != null) {
+ List* When we run the unit tests in cobertura, JUnit doesn't seem to clean up static fields which leads to * tons of memory being used by the end and the JVM crashes in Travis. Manually clearing all of the * static fields seems to solve this. */ public static void clearAllStaticFieldsForUnitTest() { HapiLocalizer.setOurFailOnMissingMessage(true); - + Class theType; try { throw new Exception(); @@ -104,7 +105,7 @@ public class TestUtil { * environment */ public static void randomizeLocale() { - Locale[] availableLocales = { Locale.CANADA, Locale.GERMANY, Locale.TAIWAN }; + Locale[] availableLocales = {Locale.CANADA, Locale.GERMANY, Locale.TAIWAN}; Locale.setDefault(availableLocales[(int) (Math.random() * availableLocales.length)]); ourLog.info("Tests are running in locale: " + Locale.getDefault().getDisplayName()); if (Math.random() < 0.5) { @@ -116,10 +117,19 @@ public class TestUtil { System.setProperty("file.encoding", "UTF-8"); System.setProperty("line.separator", "\n"); } - String availableTimeZones[] = { "GMT+08:00", "GMT-05:00", "GMT+00:00", "GMT+03:30" }; + String availableTimeZones[] = {"GMT+08:00", "GMT-05:00", "GMT+00:00", "GMT+03:30"}; String timeZone = availableTimeZones[(int) (Math.random() * availableTimeZones.length)]; TimeZone.setDefault(TimeZone.getTimeZone(timeZone)); ourLog.info("Tests are using time zone: {}", TimeZone.getDefault().getID()); } + /** + * THIS IS FOR UNIT TESTS ONLY - DO NOT CALL THIS METHOD FROM USER CODE + *
+ * Strip \r chars from a string to account for line ending platform differences
+ */
+ public static String stripReturns(String theString) {
+ return defaultString(theString).replace("\r", "");
+ }
+
}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlDetectionUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlDetectionUtil.java
new file mode 100644
index 00000000000..4619418d7c8
--- /dev/null
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlDetectionUtil.java
@@ -0,0 +1,57 @@
+package ca.uhn.fhir.util;
+
+/*-
+ * #%L
+ * HAPI FHIR - Core Library
+ * %%
+ * Copyright (C) 2014 - 2017 University Health Network
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Reader;
+import java.io.StringReader;
+
+public class XmlDetectionUtil {
+
+ private static final Logger ourLog = LoggerFactory.getLogger(XmlDetectionUtil.class);
+ private static Boolean ourStaxPresent;
+
+ /**
+ * This method will return true if a StAX XML parsing library is present
+ * on the classpath
+ */
+ public static boolean isStaxPresent() {
+ Boolean retVal = ourStaxPresent;
+ if (retVal == null) {
+ try {
+ Class.forName("javax.xml.stream.events.XMLEvent");
+ Class xmlUtilClazz = Class.forName("ca.uhn.fhir.util.XmlUtil");
+ xmlUtilClazz.getMethod("createXmlReader", Reader.class).invoke(xmlUtilClazz, new StringReader(""));
+ ourStaxPresent = Boolean.TRUE;
+ retVal = Boolean.TRUE;
+ } catch (Throwable t) {
+ ourLog.info("StAX not detected on classpath, XML processing will be disabled");
+ ourStaxPresent = Boolean.FALSE;
+ retVal = Boolean.FALSE;
+ }
+ }
+ return retVal;
+ }
+
+
+}
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java
index c42fc0d42e8..301bdfe42ba 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/XmlUtil.java
@@ -20,12 +20,13 @@ package ca.uhn.fhir.util;
* #L%
*/
import java.io.*;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
import javax.xml.stream.*;
+import javax.xml.stream.events.XMLEvent;
+import ca.uhn.fhir.model.primitive.XhtmlDt;
+import ca.uhn.fhir.parser.DataFormatException;
import org.apache.commons.lang3.StringEscapeUtils;
import org.codehaus.stax2.XMLOutputFactory2;
import org.codehaus.stax2.io.EscapingWriterFactory;
@@ -37,21 +38,22 @@ import ca.uhn.fhir.context.ConfigurationException;
import ca.uhn.fhir.util.jar.DependencyLogFactory;
import ca.uhn.fhir.util.jar.IDependencyLog;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
/**
* Utility methods for working with the StAX API.
*
* This class contains code adapted from the Apache Axiom project.
*/
public class XmlUtil {
+ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(XmlUtil.class);
+ private static final Maptrue if a StAX XML parsing library is present
- * on the classpath
- */
- public static boolean isStaxPresent() {
- Boolean retVal = ourStaxPresent;
- if (retVal == null) {
- try {
- newInputFactory();
- ourStaxPresent = Boolean.TRUE;
- retVal = Boolean.TRUE;
- } catch (ConfigurationException e) {
- ourLog.info("StAX not detected on classpath, XML processing will be disabled");
- ourStaxPresent = Boolean.FALSE;
- retVal = Boolean.FALSE;
- }
- }
- return retVal;
- }
public static class MyEscaper implements EscapingWriterFactory {
diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/DefinitionException.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/DefinitionException.java
deleted file mode 100644
index 3896b1dd9b1..00000000000
--- a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/DefinitionException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.hl7.fhir.exceptions;
-
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-
-public class DefinitionException extends FHIRException {
-
- private static final long serialVersionUID = 8175803009974854088L;
-
- public DefinitionException() {
- super();
- }
-
- public DefinitionException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public DefinitionException(String message) {
- super(message);
- }
-
- public DefinitionException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/FHIRException.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/FHIRException.java
deleted file mode 100644
index 274864c3078..00000000000
--- a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/FHIRException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.hl7.fhir.exceptions;
-
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-
-public class FHIRException extends Exception {
-
- // Note that the 4-argument constructor has been removed as it is not JDK6 compatible
-
- private static final long serialVersionUID = -1793365096090608037L;
-
- public FHIRException() {
- super();
- }
-
- public FHIRException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public FHIRException(String message) {
- super(message);
- }
-
- public FHIRException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/FHIRFormatError.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/FHIRFormatError.java
deleted file mode 100644
index 42c96577801..00000000000
--- a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/FHIRFormatError.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.hl7.fhir.exceptions;
-
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-
-public class FHIRFormatError extends FHIRException {
-
- private static final long serialVersionUID = 1L;
-
- public FHIRFormatError() {
- super();
- }
-
- public FHIRFormatError(String message, Throwable cause) {
- super(message, cause);
- }
-
- public FHIRFormatError(String message) {
- super(message);
- }
-
- public FHIRFormatError(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/NoTerminologyServiceException.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/NoTerminologyServiceException.java
deleted file mode 100644
index 08be82d5d89..00000000000
--- a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/NoTerminologyServiceException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.hl7.fhir.exceptions;
-
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-
-public class NoTerminologyServiceException extends FHIRException {
-
- private static final long serialVersionUID = 8196224236579018584L;
-
- public NoTerminologyServiceException() {
- super();
- }
-
- public NoTerminologyServiceException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public NoTerminologyServiceException(String message) {
- super(message);
- }
-
- public NoTerminologyServiceException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/PathEngineException.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/PathEngineException.java
deleted file mode 100644
index b56c9d9212c..00000000000
--- a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/PathEngineException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.hl7.fhir.exceptions;
-
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-
-public class PathEngineException extends FHIRException {
-
- private static final long serialVersionUID = -8550234068917355391L;
-
- public PathEngineException() {
- super();
- }
-
- public PathEngineException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public PathEngineException(String message) {
- super(message);
- }
-
- public PathEngineException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/TerminologyServiceException.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/TerminologyServiceException.java
deleted file mode 100644
index 2f1ae3dca5a..00000000000
--- a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/TerminologyServiceException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.hl7.fhir.exceptions;
-
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-
-public class TerminologyServiceException extends FHIRException {
-
- private static final long serialVersionUID = -1547510329455394225L;
-
- public TerminologyServiceException() {
- super();
- }
-
- public TerminologyServiceException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public TerminologyServiceException(String message) {
- super(message);
- }
-
- public TerminologyServiceException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/UcumException.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/UcumException.java
deleted file mode 100644
index c1c2bd8a90e..00000000000
--- a/hapi-fhir-base/src/main/java/org/hl7/fhir/exceptions/UcumException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.hl7.fhir.exceptions;
-
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-
-public class UcumException extends FHIRException {
-
- private static final long serialVersionUID = -8535757334881835619L;
-
- public UcumException() {
- super();
- }
-
- public UcumException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public UcumException(String message) {
- super(message);
- }
-
- public UcumException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/api/CacheControlDirectiveTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/api/CacheControlDirectiveTest.java
new file mode 100644
index 00000000000..4591b4bc1f1
--- /dev/null
+++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/api/CacheControlDirectiveTest.java
@@ -0,0 +1,58 @@
+package ca.uhn.fhir.rest.api;
+
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class CacheControlDirectiveTest {
+
+ @Test
+ public void testParseNoCache() {
+ List
Cache-Control: nostore, max-results=NNN
+ * directive. If the client tries to exceed this limit, the
+ * request will be denied. Defaults to 1000.
+ */
+ public Integer getCacheControlNoStoreMaxResultsUpperLimit() {
+ return myCacheControlNoStoreMaxResultsUpperLimit;
+ }
+
+ /**
+ * Specifies the highest number that a client is permitted to use in a
+ * Cache-Control: nostore, max-results=NNN
+ * directive. If the client tries to exceed this limit, the
+ * request will be denied. Defaults to 1000.
+ */
+ public void setCacheControlNoStoreMaxResultsUpperLimit(Integer theCacheControlNoStoreMaxResults) {
+ myCacheControlNoStoreMaxResultsUpperLimit = theCacheControlNoStoreMaxResults;
+ }
+
+ /**
+ * When searching, if set to a non-null value (default is null) the
+ * search coordinator will attempt to find at least this many results
+ * before returning a response to the client. This parameter mainly affects
+ * whether a "total count" is included in the response bundle for searches that
+ * return large amounts of data.
+ * + * For a search that returns 10000 results, if this value is set to + * 10000 the search coordinator will find all 10000 results + * prior to returning, so the initial response bundle will have the + * total set to 10000. If this value is null (or less than 10000) + * the response bundle will likely return slightly faster, but will + * not include the total. Subsequent page requests will likely + * include the total however, if they are performed after the + * search coordinator has found all results. + *
+ *
+ * Set this value to 0 to always load all
+ * results before returning.
+ *
null) the
+ * search coordinator will attempt to find at least this many results
+ * before returning a response to the client. This parameter mainly affects
+ * whether a "total count" is included in the response bundle for searches that
+ * return large amounts of data.
+ * + * For a search that returns 10000 results, if this value is set to + * 10000 the search coordinator will find all 10000 results + * prior to returning, so the initial response bundle will have the + * total set to 10000. If this value is null (or less than 10000) + * the response bundle will likely return slightly faster, but will + * not include the total. Subsequent page requests will likely + * include the total however, if they are performed after the + * search coordinator has found all results. + *
+ *
+ * Set this value to 0 to always load all
+ * results before returning.
+ *
+ * Note that if this is set to a non-null value, clients may override this setting by using
+ * the Cache-Control header. If this is set to null, the Cache-Control
+ * header will be ignored.
+ *
+ * Note that if this is set to a non-null value, clients may override this setting by using
+ * the Cache-Control header. If this is set to null, the Cache-Control
+ * header will be ignored.
+ *
+ * This extension should be of type string and should be
+ * placed on the Subscription.channel element
+ *
+ * This extension should be of type string and should be
+ * placed on the Subscription.channel element
+ *
"));
- assertThat(resp, containsString(""));
- assertThat(resp, containsString("",
- "",
+ "",
+ "",
- "",
+ ""));
}
@@ -298,7 +261,7 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
createExternalCsAndLocalVs();
assertNotNull(myLocalVs);
myLocalVs.setId("");
-
+
//@formatter:off
Parameters respParam = ourClient
.operation()
@@ -308,16 +271,15 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
//@formatter:on
-
+
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
-
+
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, not(containsStringIgnoringCase("")));
-
- }
+ }
@Test
public void testExpandInvalidParams() throws IOException {
@@ -373,7 +335,7 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
public void testExpandLocalVsAgainstBuiltInCs() throws IOException {
createLocalVsPointingAtBuiltInCodeSystem();
assertNotNull(myLocalValueSetId);
-
+
//@formatter:off
Parameters respParam = ourClient
.operation()
@@ -383,22 +345,18 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
//@formatter:on
-
+
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
-
+
assertThat(resp, containsStringIgnoringCase(""));
}
-
-
-
-
-
+
@Test
public void testExpandLocalVsAgainstExternalCs() throws IOException {
createExternalCsAndLocalVs();
assertNotNull(myLocalValueSetId);
-
+
//@formatter:off
Parameters respParam = ourClient
.operation()
@@ -408,21 +366,21 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
//@formatter:on
-
+
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
-
+
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, not(containsStringIgnoringCase("")));
-
+
}
@Test
public void testExpandLocalVsCanonicalAgainstExternalCs() throws IOException {
createExternalCsAndLocalVs();
assertNotNull(myLocalValueSetId);
-
+
//@formatter:off
Parameters respParam = ourClient
.operation()
@@ -432,21 +390,21 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
//@formatter:on
-
+
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
-
+
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, not(containsStringIgnoringCase("")));
-
+
}
@Test
public void testExpandLocalVsWithUnknownCode() throws IOException {
createExternalCsAndLocalVsWithUnknownCode();
assertNotNull(myLocalValueSetId);
-
+
//@formatter:off
try {
ourClient
@@ -461,34 +419,31 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
//@formatter:on
}
+ /**
+ * #516
+ */
@Test
- public void testValiedateCodeAgainstBuiltInSystem() {
- //@formatter:off
- Parameters respParam = ourClient
- .operation()
- .onType(ValueSet.class)
- .named("validate-code")
- .withParameter(Parameters.class, "code", new StringType("BRN"))
- .andParameter("identifier", new StringType("http://hl7.org/fhir/ValueSet/v2-0487"))
- .andParameter("system", new StringType("http://hl7.org/fhir/v2/0487"))
- .useHttpGet()
- .execute();
- //@formatter:on
+ public void testInvalidFilter() throws Exception {
+ String string = IOUtils.toString(getClass().getResourceAsStream("/bug_516_invalid_expansion.json"), StandardCharsets.UTF_8);
+ HttpPost post = new HttpPost(ourServerBase + "/ValueSet/%24expand");
+ post.setEntity(new StringEntity(string, ContentType.parse(ca.uhn.fhir.rest.api.Constants.CT_FHIR_JSON_NEW)));
- String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
- ourLog.info(resp);
-
- assertEquals("result", respParam.getParameter().get(0).getName());
- assertEquals(true, ((BooleanType)respParam.getParameter().get(0).getValue()).getValue().booleanValue());
-
- assertEquals("message", respParam.getParameter().get(1).getName());
- assertThat(((StringType)respParam.getParameter().get(1).getValue()).getValue(), containsStringIgnoringCase("succeeded"));
+ CloseableHttpResponse resp = ourHttpClient.execute(post);
+ try {
- assertEquals("display", respParam.getParameter().get(2).getName());
- assertEquals("Burn", ((StringType)respParam.getParameter().get(2).getValue()).getValue());
+ String respString = IOUtils.toString(resp.getEntity().getContent(), StandardCharsets.UTF_8);
+ ourLog.info(respString);
+
+ ourLog.info(resp.toString());
+
+ assertEquals(400, resp.getStatusLine().getStatusCode());
+ assertThat(respString, containsString("Unknown FilterOperator code 'n'"));
+
+ } finally {
+ IOUtils.closeQuietly(resp);
+ }
}
-
@Test
public void testValidateCodeOperationByCodeAndSystemInstance() {
//@formatter:off
@@ -503,8 +458,8 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
ourLog.info(resp);
-
- assertEquals(true, ((BooleanType)respParam.getParameter().get(0).getValue()).booleanValue());
+
+ assertEquals(true, ((BooleanType) respParam.getParameter().get(0).getValue()).booleanValue());
}
@Test
@@ -521,8 +476,64 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
ourLog.info(resp);
-
- assertEquals(true, ((BooleanType)respParam.getParameter().get(0).getValue()).booleanValue());
+
+ assertEquals(true, ((BooleanType) respParam.getParameter().get(0).getValue()).booleanValue());
+ }
+
+ /**
+ * Technically this is the wrong param name
+ */
+ @Test
+ public void testValiedateCodeAgainstBuiltInSystem() {
+ Parameters respParam = ourClient
+ .operation()
+ .onType(ValueSet.class)
+ .named("validate-code")
+ .withParameter(Parameters.class, "code", new StringType("BRN"))
+ .andParameter("identifier", new StringType("http://hl7.org/fhir/ValueSet/v2-0487"))
+ .andParameter("system", new StringType("http://hl7.org/fhir/v2/0487"))
+ .useHttpGet()
+ .execute();
+
+ String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
+ ourLog.info(resp);
+
+ assertEquals("result", respParam.getParameter().get(0).getName());
+ assertEquals(true, ((BooleanType) respParam.getParameter().get(0).getValue()).getValue().booleanValue());
+
+ assertEquals("message", respParam.getParameter().get(1).getName());
+ assertThat(((StringType) respParam.getParameter().get(1).getValue()).getValue(), containsStringIgnoringCase("succeeded"));
+
+ assertEquals("display", respParam.getParameter().get(2).getName());
+ assertEquals("Burn", ((StringType) respParam.getParameter().get(2).getValue()).getValue());
+ }
+
+ /**
+ * Technically this is the right param name
+ */
+ @Test
+ public void testValiedateCodeAgainstBuiltInSystemByUrl() {
+ Parameters respParam = ourClient
+ .operation()
+ .onType(ValueSet.class)
+ .named("validate-code")
+ .withParameter(Parameters.class, "code", new StringType("BRN"))
+ .andParameter("url", new StringType("http://hl7.org/fhir/ValueSet/v2-0487"))
+ .andParameter("system", new StringType("http://hl7.org/fhir/v2/0487"))
+ .useHttpGet()
+ .execute();
+
+ String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
+ ourLog.info(resp);
+
+ assertEquals("result", respParam.getParameter().get(0).getName());
+ assertEquals(true, ((BooleanType) respParam.getParameter().get(0).getValue()).getValue().booleanValue());
+
+ assertEquals("message", respParam.getParameter().get(1).getName());
+ assertThat(((StringType) respParam.getParameter().get(1).getValue()).getValue(), containsStringIgnoringCase("succeeded"));
+
+ assertEquals("display", respParam.getParameter().get(2).getName());
+ assertEquals("Burn", ((StringType) respParam.getParameter().get(2).getValue()).getValue());
}
@AfterClass
@@ -530,4 +541,38 @@ public class ResourceProviderDstu3ValueSetTest extends BaseResourceProviderDstu3
TestUtil.clearAllStaticFieldsForUnitTest();
}
+ public static CodeSystem createExternalCs(IFhirResourceDao theCodeSystemDao, IResourceTableDao theResourceTableDao, IHapiTerminologySvc theTermSvc, ServletRequestDetails theRequestDetails) {
+ CodeSystem codeSystem = new CodeSystem();
+ codeSystem.setUrl(URL_MY_CODE_SYSTEM);
+ codeSystem.setContent(CodeSystemContentMode.NOTPRESENT);
+ IIdType id = theCodeSystemDao.create(codeSystem, theRequestDetails).getId().toUnqualified();
+
+ ResourceTable table = theResourceTableDao.findOne(id.getIdPartAsLong());
+
+ TermCodeSystemVersion cs = new TermCodeSystemVersion();
+ cs.setResource(table);
+ cs.setResourceVersionId(table.getVersion());
+
+ TermConcept parentA = new TermConcept(cs, "ParentA").setDisplay("Parent A");
+ cs.getConcepts().add(parentA);
+
+ TermConcept childAA = new TermConcept(cs, "childAA").setDisplay("Child AA");
+ parentA.addChild(childAA, RelationshipTypeEnum.ISA);
+
+ TermConcept childAAA = new TermConcept(cs, "childAAA").setDisplay("Child AAA");
+ childAA.addChild(childAAA, RelationshipTypeEnum.ISA);
+
+ TermConcept childAAB = new TermConcept(cs, "childAAB").setDisplay("Child AAB");
+ childAA.addChild(childAAB, RelationshipTypeEnum.ISA);
+
+ TermConcept childAB = new TermConcept(cs, "childAB").setDisplay("Child AB");
+ parentA.addChild(childAB, RelationshipTypeEnum.ISA);
+
+ TermConcept parentB = new TermConcept(cs, "ParentB").setDisplay("Parent B");
+ cs.getConcepts().add(parentB);
+
+ theTermSvc.storeNewCodeSystemVersion(table.getId(), URL_MY_CODE_SYSTEM, cs);
+ return codeSystem;
+ }
+
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderInterceptorDstu3Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderInterceptorDstu3Test.java
index 29798cf84bf..2a4e87c050d 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderInterceptorDstu3Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderInterceptorDstu3Test.java
@@ -1,7 +1,6 @@
package ca.uhn.fhir.jpa.provider.dstu3;
import ca.uhn.fhir.jpa.provider.r4.ResourceProviderInterceptorR4Test;
-import ca.uhn.fhir.model.dstu2.resource.Conformance;
import ca.uhn.fhir.parser.IParser;
import ca.uhn.fhir.rest.api.Constants;
import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
@@ -61,8 +60,8 @@ public class ResourceProviderInterceptorDstu3Test extends BaseResourceProviderDs
public void before() throws Exception {
super.before();
- myServerInterceptor = mock(IServerInterceptor.class);
- myDaoInterceptor = mock(IServerInterceptor.class);
+ myServerInterceptor = mock(IServerInterceptor.class, withSettings().verboseLogging());
+ myDaoInterceptor = mock(IServerInterceptor.class, withSettings().verboseLogging());
resetServerInterceptor();
@@ -125,6 +124,8 @@ public class ResourceProviderInterceptorDstu3Test extends BaseResourceProviderDs
public void testCreateResourceInTransaction() throws IOException, ServletException {
String methodName = "testCreateResourceInTransaction";
+ ourLog.info("** Starting {}", methodName);
+
Patient pt = new Patient();
pt.addName().setFamily(methodName);
@@ -140,6 +141,11 @@ public class ResourceProviderInterceptorDstu3Test extends BaseResourceProviderDs
resetServerInterceptor();
+ ArgumentCaptor ardCaptor = ArgumentCaptor.forClass(ActionRequestDetails.class);
+ ArgumentCaptor opTypeCaptor = ArgumentCaptor.forClass(RestOperationTypeEnum.class);
+ verify(myDaoInterceptor, times(0)).incomingRequestPreHandled(opTypeCaptor.capture(), ardCaptor.capture());
+ verify(myServerInterceptor, times(0)).incomingRequestPreHandled(opTypeCaptor.capture(), ardCaptor.capture());
+
HttpPost post = new HttpPost(ourServerBase + "/");
post.setEntity(new StringEntity(resource, ContentType.create(Constants.CT_FHIR_XML, "UTF-8")));
CloseableHttpResponse response = ourHttpClient.execute(post);
@@ -153,8 +159,8 @@ public class ResourceProviderInterceptorDstu3Test extends BaseResourceProviderDs
* Server Interceptor
*/
- ArgumentCaptor ardCaptor = ArgumentCaptor.forClass(ActionRequestDetails.class);
- ArgumentCaptor opTypeCaptor = ArgumentCaptor.forClass(RestOperationTypeEnum.class);
+ ardCaptor = ArgumentCaptor.forClass(ActionRequestDetails.class);
+ opTypeCaptor = ArgumentCaptor.forClass(RestOperationTypeEnum.class);
verify(myServerInterceptor, times(2)).incomingRequestPreHandled(opTypeCaptor.capture(), ardCaptor.capture());
assertEquals(RestOperationTypeEnum.TRANSACTION, opTypeCaptor.getAllValues().get(0));
assertEquals(null, ardCaptor.getAllValues().get(0).getResourceType());
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorResourceProviderR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorResourceProviderR4Test.java
index 758c6daf735..2ac8b37a4f1 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorResourceProviderR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/AuthorizationInterceptorResourceProviderR4Test.java
@@ -9,6 +9,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException;
+import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
import org.apache.http.client.methods.*;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
@@ -69,19 +71,68 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
Patient patient = new Patient();
patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
patient.addName().setFamily("Tester").addGiven("Raghad");
- IIdType id = ourClient.create().resource(patient).execute().getId();
+ IIdType id = myClient.create().resource(patient).execute().getId();
try {
- ourClient.delete().resourceById(id.toUnqualifiedVersionless()).execute();
+ myClient.delete().resourceById(id.toUnqualifiedVersionless()).execute();
fail();
} catch (ForbiddenOperationException e) {
// good
}
- patient = ourClient.read().resource(Patient.class).withId(id.toUnqualifiedVersionless()).execute();
+ patient = myClient.read().resource(Patient.class).withId(id.toUnqualifiedVersionless()).execute();
assertEquals(id.getValue(), patient.getId());
}
-
+
+ /**
+ * See #751
+ */
+ @Test
+ public void testDeleteInCompartmentIsBlocked() {
+
+ Patient patient = new Patient();
+ patient.setId("Patient/A");
+ patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
+ patient.addName().setFamily("Tester").addGiven("Raghad");
+ IIdType id = myClient.update().resource(patient).execute().getId();
+
+ Observation obs = new Observation();
+ obs.setId("Observation/B");
+ obs.getSubject().setReference("Patient/A");
+ myClient.update().resource(obs).execute();
+
+ obs = new Observation();
+ obs.setId("Observation/C");
+ obs.setStatus(ObservationStatus.FINAL);
+ myClient.update().resource(obs).execute();
+
+ ourRestServer.registerInterceptor(new AuthorizationInterceptor(PolicyEnum.DENY) {
+ @Override
+ public List buildRuleList(RequestDetails theRequestDetails) {
+ return new RuleBuilder()
+ .allow().delete().allResources().inCompartment("Patient", new IdType("Patient/A")).andThen()
+ .allow().read().allResources().withAnyId().andThen()
+ .denyAll()
+ .build();
+ }
+ });
+
+ myClient.delete().resourceById(new IdType("Observation/B")).execute();
+
+ try {
+ myClient.read().resource(Observation.class).withId("Observation/B").execute();
+ fail();
+ } catch (ResourceGoneException e) {
+ // good
+ }
+
+ try {
+ myClient.delete().resourceById(new IdType("Observation/C")).execute();
+ fail();
+ } catch (ForbiddenOperationException e) {
+ // good
+ }
+ }
/**
* See #503
@@ -92,16 +143,16 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
Patient patient = new Patient();
patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
patient.addName().setFamily("Tester").addGiven("Raghad");
- final IIdType id = ourClient.create().resource(patient).execute().getId();
+ final IIdType id = myClient.create().resource(patient).execute().getId();
Observation obsInCompartment = new Observation();
obsInCompartment.setStatus(ObservationStatus.FINAL);
obsInCompartment.getSubject().setReferenceElement(id.toUnqualifiedVersionless());
- IIdType obsInCompartmentId = ourClient.create().resource(obsInCompartment).execute().getId().toUnqualifiedVersionless();
+ IIdType obsInCompartmentId = myClient.create().resource(obsInCompartment).execute().getId().toUnqualifiedVersionless();
Observation obsNotInCompartment = new Observation();
obsNotInCompartment.setStatus(ObservationStatus.FINAL);
- IIdType obsNotInCompartmentId = ourClient.create().resource(obsNotInCompartment).execute().getId().toUnqualifiedVersionless();
+ IIdType obsNotInCompartmentId = myClient.create().resource(obsNotInCompartment).execute().getId().toUnqualifiedVersionless();
ourRestServer.registerInterceptor(new AuthorizationInterceptor(PolicyEnum.DENY) {
@Override
@@ -114,10 +165,10 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
}
});
- ourClient.delete().resourceById(obsInCompartmentId.toUnqualifiedVersionless()).execute();
+ myClient.delete().resourceById(obsInCompartmentId.toUnqualifiedVersionless()).execute();
try {
- ourClient.delete().resourceById(obsNotInCompartmentId.toUnqualifiedVersionless()).execute();
+ myClient.delete().resourceById(obsNotInCompartmentId.toUnqualifiedVersionless()).execute();
fail();
} catch (ForbiddenOperationException e) {
// good
@@ -130,7 +181,7 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
Patient patient = new Patient();
patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
patient.addName().setFamily("Tester").addGiven("Raghad");
- final MethodOutcome output1 = ourClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|100").execute();
+ final MethodOutcome output1 = myClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|100").execute();
ourRestServer.registerInterceptor(new AuthorizationInterceptor(PolicyEnum.DENY) {
@Override
@@ -148,7 +199,7 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
patient.setId(output1.getId().toUnqualifiedVersionless());
patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
patient.addName().setFamily("Tester").addGiven("Raghad");
- MethodOutcome output2 = ourClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|100").execute();
+ MethodOutcome output2 = myClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|100").execute();
assertEquals(output1.getId().getIdPart(), output2.getId().getIdPart());
@@ -156,7 +207,7 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
patient.addName().setFamily("Tester").addGiven("Raghad");
try {
- ourClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|101").execute();
+ myClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|101").execute();
fail();
} catch (ForbiddenOperationException e) {
assertEquals("HTTP 403 Forbidden: Access denied by default policy (no applicable rules)", e.getMessage());
@@ -167,7 +218,7 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
patient.addName().setFamily("Tester").addGiven("Raghad");
try {
- ourClient.update().resource(patient).execute();
+ myClient.update().resource(patient).execute();
fail();
} catch (ForbiddenOperationException e) {
assertEquals("HTTP 403 Forbidden: Access denied by default policy (no applicable rules)", e.getMessage());
@@ -182,11 +233,11 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
public void testBlockUpdatingPatientUserDoesnNotHaveAccessTo() throws IOException {
Patient pt1 = new Patient();
pt1.setActive(true);
- final IIdType pid1 = ourClient.create().resource(pt1).execute().getId().toUnqualifiedVersionless();
+ final IIdType pid1 = myClient.create().resource(pt1).execute().getId().toUnqualifiedVersionless();
Patient pt2 = new Patient();
pt2.setActive(false);
- final IIdType pid2 = ourClient.create().resource(pt2).execute().getId().toUnqualifiedVersionless();
+ final IIdType pid2 = myClient.create().resource(pt2).execute().getId().toUnqualifiedVersionless();
ourRestServer.registerInterceptor(new AuthorizationInterceptor(PolicyEnum.DENY) {
@Override
@@ -200,7 +251,7 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
Observation obs = new Observation();
obs.setStatus(ObservationStatus.FINAL);
obs.setSubject(new Reference(pid1));
- IIdType oid = ourClient.create().resource(obs).execute().getId().toUnqualified();
+ IIdType oid = myClient.create().resource(obs).execute().getId().toUnqualified();
unregisterInterceptors();
@@ -224,7 +275,7 @@ public class AuthorizationInterceptorResourceProviderR4Test extends BaseResource
obs.setSubject(new Reference(pid2));
try {
- ourClient.update().resource(obs).execute();
+ myClient.update().resource(obs).execute();
fail();
} catch (ForbiddenOperationException e) {
// good
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java
index b051b94e155..12e8f7f0967 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/BaseResourceProviderR4Test.java
@@ -47,7 +47,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
public abstract class BaseResourceProviderR4Test extends BaseJpaR4Test {
protected static JpaValidationSupportChainR4 myValidationSupport;
- protected static IGenericClient ourClient;
+ protected IGenericClient myClient;
protected static CloseableHttpClient ourHttpClient;
protected static int ourPort;
protected static RestfulServer ourRestServer;
@@ -150,10 +150,6 @@ public abstract class BaseResourceProviderR4Test extends BaseJpaR4Test {
ourSearchParamRegistry = wac.getBean(SearchParamRegistryR4.class);
myFhirCtx.getRestfulClientFactory().setSocketTimeout(5000000);
- ourClient = myFhirCtx.newRestfulGenericClient(ourServerBase);
- if (shouldLogClient()) {
- ourClient.registerInterceptor(new LoggingInterceptor());
- }
PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(5000, TimeUnit.MILLISECONDS);
HttpClientBuilder builder = HttpClientBuilder.create();
@@ -165,6 +161,11 @@ public abstract class BaseResourceProviderR4Test extends BaseJpaR4Test {
}
ourRestServer.setPagingProvider(ourPagingProvider);
+
+ myClient = myFhirCtx.newRestfulGenericClient(ourServerBase);
+ if (shouldLogClient()) {
+ myClient.registerInterceptor(new LoggingInterceptor());
+ }
}
/**
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/GraphQLProviderR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/GraphQLProviderR4Test.java
index 2a554e36963..286c6d9ce0b 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/GraphQLProviderR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/GraphQLProviderR4Test.java
@@ -1,11 +1,11 @@
package ca.uhn.fhir.jpa.provider.r4;
+import ca.uhn.fhir.util.TestUtil;
import ca.uhn.fhir.util.UrlUtil;
import org.apache.commons.io.IOUtils;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.Patient;
import org.junit.Test;
import org.slf4j.Logger;
@@ -31,14 +31,14 @@ public class GraphQLProviderR4Test extends BaseResourceProviderR4Test {
try {
String resp = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
ourLog.info(resp);
- assertEquals(resp, "{\n" +
+ assertEquals(TestUtil.stripReturns(resp), TestUtil.stripReturns("{\n" +
" \"name\":[{\n" +
" \"family\":\"FAM\",\n" +
" \"given\":[\"GIVEN1\",\"GIVEN2\"]\n" +
" },{\n" +
" \"given\":[\"GivenOnly1\",\"GivenOnly2\"]\n" +
" }]\n" +
- "}");
+ "}"));
} finally {
IOUtils.closeQuietly(response);
}
@@ -56,7 +56,7 @@ public class GraphQLProviderR4Test extends BaseResourceProviderR4Test {
try {
String resp = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
ourLog.info(resp);
- assertEquals(resp, "{\n" +
+ assertEquals(TestUtil.stripReturns(resp), TestUtil.stripReturns("{\n" +
" \"PatientList\":[{\n" +
" \"name\":[{\n" +
" \"family\":\"FAM\",\n" +
@@ -69,7 +69,7 @@ public class GraphQLProviderR4Test extends BaseResourceProviderR4Test {
" \"given\":[\"GivenOnlyB1\",\"GivenOnlyB2\"]\n" +
" }]\n" +
" }]\n" +
- "}");
+ "}"));
} finally {
IOUtils.closeQuietly(response);
}
@@ -85,13 +85,13 @@ public class GraphQLProviderR4Test extends BaseResourceProviderR4Test {
p.addName()
.addGiven("GivenOnly1")
.addGiven("GivenOnly2");
- myPatientId0 = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
+ myPatientId0 = myClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
p = new Patient();
p.addName()
.addGiven("GivenOnlyB1")
.addGiven("GivenOnlyB2");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientEverythingR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientEverythingR4Test.java
index ba0db38b0e9..37b45783b2b 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientEverythingR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/PatientEverythingR4Test.java
@@ -57,41 +57,41 @@ public class PatientEverythingR4Test extends BaseResourceProviderR4Test {
Organization org = new Organization();
org.setName("an org");
- orgId = ourClient.create().resource(org).execute().getId().toUnqualifiedVersionless().getValue();
+ orgId = myClient.create().resource(org).execute().getId().toUnqualifiedVersionless().getValue();
ourLog.info("OrgId: {}", orgId);
Patient patient = new Patient();
patient.getManagingOrganization().setReference(orgId);
- patId = ourClient.create().resource(patient).execute().getId().toUnqualifiedVersionless().getValue();
+ patId = myClient.create().resource(patient).execute().getId().toUnqualifiedVersionless().getValue();
Patient patient2 = new Patient();
patient2.getManagingOrganization().setReference(orgId);
- myWrongPatId = ourClient.create().resource(patient2).execute().getId().toUnqualifiedVersionless().getValue();
+ myWrongPatId = myClient.create().resource(patient2).execute().getId().toUnqualifiedVersionless().getValue();
Encounter enc1 = new Encounter();
enc1.setStatus(EncounterStatus.CANCELLED);
enc1.getSubject().setReference(patId);
enc1.getServiceProvider().setReference(orgId);
- encId1 = ourClient.create().resource(enc1).execute().getId().toUnqualifiedVersionless().getValue();
+ encId1 = myClient.create().resource(enc1).execute().getId().toUnqualifiedVersionless().getValue();
Encounter enc2 = new Encounter();
enc2.setStatus(EncounterStatus.ARRIVED);
enc2.getSubject().setReference(patId);
enc2.getServiceProvider().setReference(orgId);
- encId2 = ourClient.create().resource(enc2).execute().getId().toUnqualifiedVersionless().getValue();
+ encId2 = myClient.create().resource(enc2).execute().getId().toUnqualifiedVersionless().getValue();
Encounter wrongEnc1 = new Encounter();
wrongEnc1.setStatus(EncounterStatus.ARRIVED);
wrongEnc1.getSubject().setReference(myWrongPatId);
wrongEnc1.getServiceProvider().setReference(orgId);
- myWrongEnc1 = ourClient.create().resource(wrongEnc1).execute().getId().toUnqualifiedVersionless().getValue();
+ myWrongEnc1 = myClient.create().resource(wrongEnc1).execute().getId().toUnqualifiedVersionless().getValue();
myObsIds = new ArrayList();
for (int i = 0; i < 20; i++) {
Observation obs = new Observation();
obs.getSubject().setReference(patId);
obs.setStatus(ObservationStatus.FINAL);
- String obsId = ourClient.create().resource(obs).execute().getId().toUnqualifiedVersionless().getValue();
+ String obsId = myClient.create().resource(obs).execute().getId().toUnqualifiedVersionless().getValue();
myObsIds.add(obsId);
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderCustomSearchParamR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderCustomSearchParamR4Test.java
index c0bfdc29769..a46d3cc363f 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderCustomSearchParamR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderCustomSearchParamR4Test.java
@@ -54,7 +54,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
sp.setTitle("Foo Param");
try {
- ourClient.create().resource(sp).execute();
+ myClient.create().resource(sp).execute();
fail();
} catch (UnprocessableEntityException e) {
assertEquals("HTTP 422 Unprocessable Entity: SearchParameter.status is missing or invalid: null", e.getMessage());
@@ -120,7 +120,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
ourLog.info(myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(eyeColourSp));
- ourClient
+ myClient
.create()
.resource(eyeColourSp)
.execute();
@@ -139,7 +139,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
p2.addExtension().setUrl("http://acme.org/eyecolour").setValue(new CodeType("green"));
IIdType p2id = myPatientDao.create(p2).getId().toUnqualifiedVersionless();
- Bundle bundle = ourClient
+ Bundle bundle = myClient
.search()
.forResource(Patient.class)
.where(new TokenClientParam("eyecolour").exactly().code("blue"))
@@ -168,7 +168,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
public void testConformanceOverrideAllowed() {
myDaoConfig.setDefaultSearchParamsCanBeOverridden(true);
- CapabilityStatement conformance = ourClient
+ CapabilityStatement conformance = myClient
.fetchConformance()
.ofType(CapabilityStatement.class)
.execute();
@@ -220,7 +220,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
}
});
- conformance = ourClient
+ conformance = myClient
.fetchConformance()
.ofType(CapabilityStatement.class)
.execute();
@@ -238,7 +238,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
public void testConformanceOverrideNotAllowed() {
myDaoConfig.setDefaultSearchParamsCanBeOverridden(false);
- CapabilityStatement conformance = ourClient
+ CapabilityStatement conformance = myClient
.fetchConformance()
.ofType(CapabilityStatement.class)
.execute();
@@ -274,7 +274,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
mySearchParamRegsitry.forceRefresh();
- conformance = ourClient
+ conformance = myClient
.fetchConformance()
.ofType(CapabilityStatement.class)
.execute();
@@ -332,7 +332,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
List foundResources;
Bundle result;
- result = ourClient
+ result = myClient
.search()
.forResource(Patient.class)
.where(new TokenClientParam("foo").exactly().code("male"))
@@ -409,7 +409,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
List foundResources;
Bundle result;
- result = ourClient
+ result = myClient
.search()
.forResource(Observation.class)
.where(new ReferenceClientParam("foo").hasChainedProperty(Patient.GENDER.exactly().code("male")))
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java
index 742e097aad0..781d7040b46 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderInterceptorR4Test.java
@@ -198,7 +198,7 @@ public class ResourceProviderInterceptorR4Test extends BaseResourceProviderR4Tes
Organization org = new Organization();
org.setName("orgName");
- IIdType orgId = ourClient.create().resource(org).execute().getId().toUnqualified();
+ IIdType orgId = myClient.create().resource(org).execute().getId().toUnqualified();
assertNotNull(orgId.getVersionIdPartAsLong());
resetServerInterceptor();
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderQuestionnaireResponseR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderQuestionnaireResponseR4Test.java
index 78423c8552b..a3e9351442f 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderQuestionnaireResponseR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderQuestionnaireResponseR4Test.java
@@ -72,7 +72,7 @@ public class ResourceProviderQuestionnaireResponseR4Test extends BaseResourcePro
qr1.setStatus(QuestionnaireResponseStatus.COMPLETED);
qr1.addItem().setLinkId("link1").addAnswer().setValue(new DecimalType(123));
try {
- ourClient.create().resource(qr1).execute();
+ myClient.create().resource(qr1).execute();
fail();
} catch (UnprocessableEntityException e) {
assertThat(e.toString(), containsString("Answer value must be of type string"));
@@ -95,7 +95,7 @@ public class ResourceProviderQuestionnaireResponseR4Test extends BaseResourcePro
qr1.setStatus(QuestionnaireResponseStatus.COMPLETED);
qr1.addItem().setLinkId("link1").addAnswer().setValue(new DecimalType(123));
try {
- ourClient.create().resource(qr1).execute();
+ myClient.create().resource(qr1).execute();
fail();
} catch (UnprocessableEntityException e) {
assertThat(e.toString(), containsString("Answer value must be of type string"));
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4BundleTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4BundleTest.java
index 075ed457670..6ea92ae282a 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4BundleTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4BundleTest.java
@@ -34,9 +34,9 @@ public class ResourceProviderR4BundleTest extends BaseResourceProviderR4Test {
composition.setTitle("Visit Summary");
bundle.addEntry().setFullUrl("http://foo").setResource(composition);
- IIdType id = ourClient.create().resource(bundle).execute().getId();
+ IIdType id = myClient.create().resource(bundle).execute().getId();
- Bundle retBundle = ourClient.read().resource(Bundle.class).withId(id).execute();
+ Bundle retBundle = myClient.read().resource(Bundle.class).withId(id).execute();
ourLog.info(myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(retBundle));
assertEquals("http://foo", bundle.getEntry().get(0).getFullUrl());
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java
new file mode 100644
index 00000000000..9ffb2e4c623
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CacheTest.java
@@ -0,0 +1,188 @@
+package ca.uhn.fhir.jpa.provider.r4;
+
+import ca.uhn.fhir.jpa.dao.DaoConfig;
+import ca.uhn.fhir.jpa.search.SearchCoordinatorSvcImpl;
+import ca.uhn.fhir.parser.StrictErrorHandler;
+import ca.uhn.fhir.rest.api.CacheControlDirective;
+import ca.uhn.fhir.rest.api.Constants;
+import ca.uhn.fhir.rest.client.interceptor.CapturingInterceptor;
+import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+import ca.uhn.fhir.util.TestUtil;
+import org.hl7.fhir.r4.model.Bundle;
+import org.hl7.fhir.r4.model.Patient;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Test;
+import org.springframework.test.util.AopTestUtils;
+
+import java.io.IOException;
+import java.util.Date;
+
+import static org.hamcrest.Matchers.*;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.*;
+
+public class ResourceProviderR4CacheTest extends BaseResourceProviderR4Test {
+
+ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderR4CacheTest.class);
+ private SearchCoordinatorSvcImpl mySearchCoordinatorSvcRaw;
+ private CapturingInterceptor myCapturingInterceptor;
+
+ @Override
+ @After
+ public void after() throws Exception {
+ super.after();
+ myDaoConfig.setReuseCachedSearchResultsForMillis(new DaoConfig().getReuseCachedSearchResultsForMillis());
+ myDaoConfig.setCacheControlNoStoreMaxResultsUpperLimit(new DaoConfig().getCacheControlNoStoreMaxResultsUpperLimit());
+
+ myClient.unregisterInterceptor(myCapturingInterceptor);
+ }
+
+ @Override
+ public void before() throws Exception {
+ super.before();
+ myFhirCtx.setParserErrorHandler(new StrictErrorHandler());
+ mySearchCoordinatorSvcRaw = AopTestUtils.getTargetObject(mySearchCoordinatorSvc);
+
+ myCapturingInterceptor = new CapturingInterceptor();
+ myClient.registerInterceptor(myCapturingInterceptor);
+ }
+
+ @Test
+ public void testCacheNoStore() throws IOException {
+
+ Patient pt1 = new Patient();
+ pt1.addName().setFamily("FAM");
+ myClient.create().resource(pt1).execute();
+
+ Bundle results = myClient
+ .search()
+ .forResource("Patient")
+ .where(Patient.FAMILY.matches().value("FAM"))
+ .returnBundle(Bundle.class)
+ .cacheControl(new CacheControlDirective().setNoStore(true))
+ .execute();
+ assertEquals(1, results.getEntry().size());
+ assertEquals(0, mySearchEntityDao.count());
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE), empty());
+
+ Patient pt2 = new Patient();
+ pt2.addName().setFamily("FAM");
+ myClient.create().resource(pt2).execute();
+
+ results = myClient
+ .search()
+ .forResource("Patient")
+ .where(Patient.FAMILY.matches().value("FAM"))
+ .returnBundle(Bundle.class)
+ .cacheControl(new CacheControlDirective().setNoStore(true))
+ .execute();
+ assertEquals(2, results.getEntry().size());
+ assertEquals(0, mySearchEntityDao.count());
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE), empty());
+
+ }
+
+ @Test
+ public void testCacheNoStoreMaxResults() throws IOException {
+
+ for (int i = 0; i < 10; i++) {
+ Patient pt1 = new Patient();
+ pt1.addName().setFamily("FAM" + i);
+ myClient.create().resource(pt1).execute();
+ }
+
+ Bundle results = myClient
+ .search()
+ .forResource("Patient")
+ .where(Patient.FAMILY.matches().value("FAM"))
+ .returnBundle(Bundle.class)
+ .cacheControl(new CacheControlDirective().setNoStore(true).setMaxResults(5))
+ .execute();
+ assertEquals(5, results.getEntry().size());
+ assertEquals(0, mySearchEntityDao.count());
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE), empty());
+
+ }
+
+ @Test
+ public void testCacheNoStoreMaxResultsWithIllegalValue() throws IOException {
+ myDaoConfig.setCacheControlNoStoreMaxResultsUpperLimit(123);
+ try {
+ myClient
+ .search()
+ .forResource("Patient")
+ .where(Patient.FAMILY.matches().value("FAM"))
+ .returnBundle(Bundle.class)
+ .cacheControl(new CacheControlDirective().setNoStore(true).setMaxResults(5000))
+ .execute();
+ fail();
+ } catch (InvalidRequestException e) {
+ assertEquals("HTTP 400 Bad Request: Cache-Control header max-results value must not exceed 123", e.getMessage());
+ }
+ }
+
+ @Test
+ public void testCacheSuppressed() throws IOException {
+
+ Patient pt1 = new Patient();
+ pt1.addName().setFamily("FAM");
+ myClient.create().resource(pt1).execute();
+
+ Bundle results = myClient.search().forResource("Patient").where(Patient.FAMILY.matches().value("FAM")).returnBundle(Bundle.class).execute();
+ assertEquals(1, results.getEntry().size());
+ assertEquals(1, mySearchEntityDao.count());
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE), empty());
+
+ Patient pt2 = new Patient();
+ pt2.addName().setFamily("FAM");
+ myClient.create().resource(pt2).execute();
+
+ results = myClient
+ .search()
+ .forResource("Patient")
+ .where(Patient.FAMILY.matches().value("FAM"))
+ .returnBundle(Bundle.class)
+ .cacheControl(new CacheControlDirective().setNoCache(true))
+ .execute();
+ assertEquals(2, results.getEntry().size());
+ assertEquals(2, mySearchEntityDao.count());
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE), empty());
+
+ }
+
+ @Test
+ public void testCacheUsedNormally() throws IOException {
+
+ Patient pt1 = new Patient();
+ pt1.addName().setFamily("FAM");
+ myClient.create().resource(pt1).execute();
+
+ Date beforeFirst = new Date();
+
+ Bundle results1 = myClient.search().forResource("Patient").where(Patient.FAMILY.matches().value("FAM")).returnBundle(Bundle.class).execute();
+ assertEquals(1, results1.getEntry().size());
+ assertEquals(1, mySearchEntityDao.count());
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE), empty());
+ assertThat(results1.getMeta().getLastUpdated(), greaterThan(beforeFirst));
+ assertThat(results1.getMeta().getLastUpdated(), lessThan(new Date()));
+ assertThat(results1.getId(), not(blankOrNullString()));
+
+ Patient pt2 = new Patient();
+ pt2.addName().setFamily("FAM");
+ myClient.create().resource(pt2).execute();
+
+ Bundle results2 = myClient.search().forResource("Patient").where(Patient.FAMILY.matches().value("FAM")).returnBundle(Bundle.class).execute();
+ assertEquals(1, results2.getEntry().size());
+ assertEquals(1, mySearchEntityDao.count());
+ assertEquals("HIT from " + ourServerBase, myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE).get(0));
+ assertEquals(results1.getMeta().getLastUpdated(), results2.getMeta().getLastUpdated());
+ assertEquals(results1.getId(), results2.getId());
+ }
+
+ @AfterClass
+ public static void afterClassClearContext() {
+ TestUtil.clearAllStaticFieldsForUnitTest();
+ }
+
+}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemTest.java
index 9b04ff87ed2..a54963a5f6f 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4CodeSystemTest.java
@@ -40,7 +40,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
public void testLookupOnExternalCode() {
ResourceProviderR4ValueSetTest.createExternalCs(myCodeSystemDao, myResourceTableDao, myTermSvc, mySrd);
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -59,7 +59,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
assertEquals(false, ((BooleanType)respParam.getParameter().get(2).getValue()).getValue().booleanValue());
// With HTTP GET
- respParam = ourClient
+ respParam = myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -82,7 +82,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
@Test
public void testLookupOperationByCodeAndSystemBuiltInCode() {
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -105,7 +105,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
public void testLookupOperationByCodeAndSystemBuiltInNonexistantCode() {
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -122,7 +122,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
@Test
public void testLookupOperationByCodeAndSystemUserDefinedCode() {
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -146,7 +146,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
public void testLookupOperationByCodeAndSystemUserDefinedNonExistantCode() {
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -163,7 +163,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
@Test
public void testLookupOperationByCoding() {
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -186,7 +186,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
public void testLookupOperationByInvalidCombination() {
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -205,7 +205,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
public void testLookupOperationByInvalidCombination2() {
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -223,7 +223,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
public void testLookupOperationByInvalidCombination3() {
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
@@ -240,7 +240,7 @@ public class ResourceProviderR4CodeSystemTest extends BaseResourceProviderR4Test
// @Ignore
public void testLookupOperationForBuiltInCode() {
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onType(CodeSystem.class)
.named("lookup")
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
index 9410fb8d2e6..5a458068ef2 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java
@@ -1,22 +1,29 @@
package ca.uhn.fhir.jpa.provider.r4;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.net.*;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-
+import ca.uhn.fhir.jpa.dao.DaoConfig;
+import ca.uhn.fhir.jpa.entity.Search;
+import ca.uhn.fhir.jpa.search.SearchCoordinatorSvcImpl;
+import ca.uhn.fhir.jpa.util.StopWatch;
+import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
+import ca.uhn.fhir.model.primitive.InstantDt;
+import ca.uhn.fhir.model.primitive.UriDt;
+import ca.uhn.fhir.parser.IParser;
+import ca.uhn.fhir.parser.StrictErrorHandler;
import ca.uhn.fhir.rest.api.Constants;
+import ca.uhn.fhir.rest.api.MethodOutcome;
+import ca.uhn.fhir.rest.api.SummaryEnum;
+import ca.uhn.fhir.rest.client.api.IGenericClient;
+import ca.uhn.fhir.rest.client.interceptor.CapturingInterceptor;
+import ca.uhn.fhir.rest.gclient.StringClientParam;
+import ca.uhn.fhir.rest.param.*;
+import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException;
+import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
+import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
+import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor;
+import ca.uhn.fhir.util.TestUtil;
+import ca.uhn.fhir.util.UrlUtil;
+import com.google.common.collect.Lists;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
@@ -24,8 +31,14 @@ import org.apache.http.NameValuePair;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.*;
-import org.apache.http.entity.*;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
import org.apache.http.message.BasicNameValuePair;
+import org.hamcrest.Matchers;
+import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.r4.model.*;
import org.hl7.fhir.r4.model.Bundle.*;
import org.hl7.fhir.r4.model.Encounter.EncounterLocationComponent;
@@ -36,36 +49,31 @@ import org.hl7.fhir.r4.model.Observation.ObservationStatus;
import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemType;
import org.hl7.fhir.r4.model.Subscription.SubscriptionChannelType;
import org.hl7.fhir.r4.model.Subscription.SubscriptionStatus;
-import org.hl7.fhir.instance.model.api.*;
import org.junit.*;
import org.springframework.test.util.AopTestUtils;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
-import com.google.common.collect.Lists;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
-import ca.uhn.fhir.jpa.dao.DaoConfig;
-import ca.uhn.fhir.jpa.entity.Search;
-import ca.uhn.fhir.jpa.search.SearchCoordinatorSvcImpl;
-import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.UriDt;
-import ca.uhn.fhir.parser.IParser;
-import ca.uhn.fhir.parser.StrictErrorHandler;
-import ca.uhn.fhir.rest.api.MethodOutcome;
-import ca.uhn.fhir.rest.api.SummaryEnum;
-import ca.uhn.fhir.rest.client.api.IGenericClient;
-import ca.uhn.fhir.rest.gclient.StringClientParam;
-import ca.uhn.fhir.rest.param.*;
-import ca.uhn.fhir.rest.server.exceptions.*;
-import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor;
-import ca.uhn.fhir.util.TestUtil;
-import ca.uhn.fhir.util.UrlUtil;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderR4Test.class);
private SearchCoordinatorSvcImpl mySearchCoordinatorSvcRaw;
+ private CapturingInterceptor myCapturingInterceptor = new CapturingInterceptor();
@Override
@After
@@ -75,11 +83,14 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete());
myDaoConfig.setAllowExternalReferences(new DaoConfig().isAllowExternalReferences());
myDaoConfig.setReuseCachedSearchResultsForMillis(new DaoConfig().getReuseCachedSearchResultsForMillis());
-
+ myDaoConfig.setCountSearchResultsUpTo(new DaoConfig().getCountSearchResultsUpTo());
+
mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(null);
mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(SearchCoordinatorSvcImpl.DEFAULT_SYNC_SIZE);
mySearchCoordinatorSvcRaw.setNeverUseLocalSearchForUnitTests(false);
+ mySearchCoordinatorSvcRaw.cancelAllActiveSearches();
+ myClient.unregisterInterceptor(myCapturingInterceptor);
}
@Override
@@ -88,6 +99,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
myFhirCtx.setParserErrorHandler(new StrictErrorHandler());
myDaoConfig.setAllowMultipleDelete(true);
+ myClient.registerInterceptor(myCapturingInterceptor);
}
@Before
@@ -102,8 +114,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
IOUtils.closeQuietly(resp.getEntity().getContent());
assertEquals(200, resp.getStatusLine().getStatusCode());
}
-
-
+
+
private ArrayList genResourcesOfType(Bundle theRes, Class theClass) {
ArrayList retVal = new ArrayList();
for (BundleEntryComponent next : theRes.getEntry()) {
@@ -123,12 +135,12 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void saveAndRetrieveBasicResource() throws IOException {
String input = IOUtils.toString(getClass().getResourceAsStream("/basic-stu3.xml"), StandardCharsets.UTF_8);
- String respString = ourClient.transaction().withBundle(input).prettyPrint().execute();
+ String respString = myClient.transaction().withBundle(input).prettyPrint().execute();
ourLog.info(respString);
Bundle bundle = myFhirCtx.newXmlParser().parseResource(Bundle.class, respString);
IdType id = new IdType(bundle.getEntry().get(0).getResponse().getLocation());
- Basic basic = ourClient.read().resource(Basic.class).withId(id).execute();
+ Basic basic = myClient.read().resource(Basic.class).withId(id).execute();
List exts = basic.getExtensionsByUrl("http://localhost:1080/hapi-fhir-jpaserver-example/baseDstu2/StructureDefinition/DateID");
assertEquals(1, exts.size());
}
@@ -168,7 +180,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
// Y
@Test
public void testBundleCreate() throws Exception {
- IGenericClient client = ourClient;
+ IGenericClient client = myClient;
String resBody = IOUtils.toString(ResourceProviderR4Test.class.getResource("/r4/document-father.json"), StandardCharsets.UTF_8);
IIdType id = client.create().resource(resBody).execute().getId();
@@ -182,7 +194,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
@Test
public void testBundleCreateWithTypeTransaction() throws Exception {
- IGenericClient client = ourClient;
+ IGenericClient client = myClient;
String resBody = IOUtils.toString(ResourceProviderR4Test.class.getResource("/r4/document-father.json"), StandardCharsets.UTF_8);
resBody = resBody.replace("\"type\": \"document\"", "\"type\": \"transaction\"");
@@ -200,10 +212,10 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
subs.setStatus(SubscriptionStatus.ACTIVE);
subs.getChannel().setType(SubscriptionChannelType.WEBSOCKET);
subs.setCriteria("Observation?");
- IIdType id = ourClient.create().resource(subs).execute().getId().toUnqualifiedVersionless();
+ IIdType id = myClient.create().resource(subs).execute().getId().toUnqualifiedVersionless();
//@formatter:off
- Bundle resp = ourClient
+ Bundle resp = myClient
.search()
.forResource(Subscription.class)
.where(Subscription.TYPE.exactly().code(SubscriptionChannelType.WEBSOCKET.toCode()))
@@ -215,7 +227,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertThat(toUnqualifiedVersionlessIds(resp), contains(id));
//@formatter:off
- resp = ourClient
+ resp = myClient
.search()
.forResource(Subscription.class)
.where(Subscription.TYPE.exactly().systemAndCode(SubscriptionChannelType.WEBSOCKET.getSystem(), SubscriptionChannelType.WEBSOCKET.toCode()))
@@ -227,7 +239,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertThat(toUnqualifiedVersionlessIds(resp), contains(id));
//@formatter:off
- resp = ourClient
+ resp = myClient
.search()
.forResource(Subscription.class)
.where(Subscription.TYPE.exactly().systemAndCode(SubscriptionChannelType.WEBSOCKET.getSystem(), SubscriptionChannelType.WEBSOCKET.toCode()))
@@ -248,13 +260,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
org.setName("rpdstu2_testCountParam_01");
resources.add(org);
}
- ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
+ myClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
- Bundle found = ourClient.search().forResource(Organization.class).where(Organization.NAME.matches().value("rpdstu2_testCountParam_01")).count(10).returnBundle(Bundle.class).execute();
+ Bundle found = myClient.search().forResource(Organization.class).where(Organization.NAME.matches().value("rpdstu2_testCountParam_01")).count(10).returnBundle(Bundle.class).execute();
assertEquals(100, found.getTotal());
assertEquals(10, found.getEntry().size());
- found = ourClient.search().forResource(Organization.class).where(Organization.NAME.matches().value("rpdstu2_testCountParam_01")).count(999).returnBundle(Bundle.class).execute();
+ found = myClient.search().forResource(Organization.class).where(Organization.NAME.matches().value("rpdstu2_testCountParam_01")).count(999).returnBundle(Bundle.class).execute();
assertEquals(100, found.getTotal());
assertEquals(50, found.getEntry().size());
@@ -265,14 +277,14 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
*/
@Test
public void testCreateAndUpdateBinary() throws ClientProtocolException, Exception {
- byte[] arr = { 1, 21, 74, 123, -44 };
+ byte[] arr = {1, 21, 74, 123, -44};
Binary binary = new Binary();
binary.setContent(arr);
binary.setContentType("dansk");
- IIdType resource = ourClient.create().resource(binary).execute().getId();
+ IIdType resource = myClient.create().resource(binary).execute().getId();
- Binary fromDB = ourClient.read().resource(Binary.class).withId(resource.toVersionless()).execute();
+ Binary fromDB = myClient.read().resource(Binary.class).withId(resource.toVersionless()).execute();
assertEquals("1", fromDB.getIdElement().getVersionIdPart());
arr[0] = 2;
@@ -286,7 +298,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
IOUtils.closeQuietly(resp);
}
- fromDB = ourClient.read().resource(Binary.class).withId(resource.toVersionless()).execute();
+ fromDB = myClient.read().resource(Binary.class).withId(resource.toVersionless()).execute();
assertEquals("2", fromDB.getIdElement().getVersionIdPart());
arr[0] = 3;
@@ -302,7 +314,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
IOUtils.closeQuietly(resp);
}
- fromDB = ourClient.read().resource(Binary.class).withId(resource.toVersionless()).execute();
+ fromDB = myClient.read().resource(Binary.class).withId(resource.toVersionless()).execute();
assertEquals("3", fromDB.getIdElement().getVersionIdPart());
// Now an update with the wrong ID in the body
@@ -319,7 +331,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
IOUtils.closeQuietly(resp);
}
- fromDB = ourClient.read().resource(Binary.class).withId(resource.toVersionless()).execute();
+ fromDB = myClient.read().resource(Binary.class).withId(resource.toVersionless()).execute();
assertEquals("3", fromDB.getIdElement().getVersionIdPart());
}
@@ -331,7 +343,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void testCreateBundle() throws IOException {
String input = IOUtils.toString(getClass().getResourceAsStream("/bryn-bundle.json"), StandardCharsets.UTF_8);
Validate.notNull(input);
- ourClient.create().resource(input).execute().getResource();
+ myClient.create().resource(input).execute().getResource();
}
@Test
@@ -340,13 +352,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
patient.addName().setFamily("Tester").addGiven("Raghad");
- MethodOutcome output1 = ourClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|100").execute();
+ MethodOutcome output1 = myClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|100").execute();
patient = new Patient();
patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
patient.addName().setFamily("Tester").addGiven("Raghad");
- MethodOutcome output2 = ourClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|100").execute();
+ MethodOutcome output2 = myClient.update().resource(patient).conditionalByUrl("Patient?identifier=http://uhn.ca/mrns|100").execute();
assertEquals(output1.getId().getIdPart(), output2.getId().getIdPart());
}
@@ -362,7 +374,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
// Missing status, which is mandatory
Observation obs = new Observation();
obs.addIdentifier().setSystem("urn:foo").setValue("bar");
- IBaseResource outcome = ourClient.create().resource(obs).execute().getOperationOutcome();
+ IBaseResource outcome = myClient.create().resource(obs).execute().getOperationOutcome();
String encodedOo = myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome);
ourLog.info(encodedOo);
@@ -370,7 +382,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertThat(encodedOo, containsString("Successfully created resource \\\"Observation/"));
interceptor.setAddValidationResultsToResponseOperationOutcome(false);
- outcome = ourClient.create().resource(obs).execute().getOperationOutcome();
+ outcome = myClient.create().resource(obs).execute().getOperationOutcome();
encodedOo = myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(outcome);
ourLog.info(encodedOo);
assertThat(encodedOo, not(containsString("cvc-complex-type.2.4.b")));
@@ -387,15 +399,15 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
CodeSystem cs = new CodeSystem();
cs.setUrl("http://urn/system");
cs.addConcept().setCode("code0");
- ourClient.create().resource(cs).execute();
+ myClient.create().resource(cs).execute();
ValueSet options = new ValueSet();
options.getCompose().addInclude().setSystem("http://urn/system");
- IIdType optId = ourClient.create().resource(options).execute().getId();
+ IIdType optId = myClient.create().resource(options).execute().getId();
Questionnaire q = new Questionnaire();
q.addItem().setLinkId("link0").setRequired(false).setType(QuestionnaireItemType.CHOICE).setOptions(new Reference(optId));
- IIdType qId = ourClient.create().resource(q).execute().getId();
+ IIdType qId = myClient.create().resource(q).execute().getId();
QuestionnaireResponse qa;
@@ -404,7 +416,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
qa = new QuestionnaireResponse();
qa.getQuestionnaire().setReference(qId.toUnqualifiedVersionless().getValue());
qa.addItem().setLinkId("link0").addAnswer().setValue(new Coding().setSystem("urn:system").setCode("code0"));
- ourClient.create().resource(qa).execute();
+ myClient.create().resource(qa).execute();
// Bad code
@@ -412,7 +424,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
qa.getQuestionnaire().setReference(qId.toUnqualifiedVersionless().getValue());
qa.addItem().setLinkId("link0").addAnswer().setValue(new Coding().setSystem("urn:system").setCode("code1"));
try {
- ourClient.create().resource(qa).execute();
+ myClient.create().resource(qa).execute();
fail();
} catch (UnprocessableEntityException e) {
assertThat(e.getMessage(), containsString("Question with linkId[link0]"));
@@ -488,7 +500,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
// //@formatter:off
-// IIdType id3 = ourClient
+// IIdType id3 = myClient
// .update()
// .resource(pt)
// .conditionalByUrl("Patient?identifier=http://general-hospital.co.uk/Identifiers|09832345234543876876")
@@ -532,14 +544,14 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(400, response.getStatusLine().getStatusCode());
OperationOutcome oo = myFhirCtx.newXmlParser().parseResource(OperationOutcome.class, responseString);
assertEquals("Can not create resource with ID \"2\", ID must not be supplied on a create (POST) operation (use an HTTP PUT / update operation if you wish to supply an ID)",
- oo.getIssue().get(0).getDiagnostics());
+ oo.getIssue().get(0).getDiagnostics());
} finally {
response.getEntity().getContent().close();
response.close();
}
}
-
+
@Test
public void testCreateWithForcedId() throws IOException {
String methodName = "testCreateWithForcedId";
@@ -548,7 +560,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
p.addName().setFamily(methodName);
p.setId(methodName);
- IIdType optId = ourClient.update().resource(p).execute().getId();
+ IIdType optId = myClient.update().resource(p).execute().getId();
assertEquals(methodName, optId.getIdPart());
assertEquals("1", optId.getVersionIdPart());
}
@@ -557,12 +569,12 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void testDeepChaining() {
Location l1 = new Location();
l1.getNameElement().setValue("testDeepChainingL1");
- IIdType l1id = ourClient.create().resource(l1).execute().getId();
+ IIdType l1id = myClient.create().resource(l1).execute().getId();
Location l2 = new Location();
l2.getNameElement().setValue("testDeepChainingL2");
l2.getPartOf().setReferenceElement(l1id.toVersionless().toUnqualified());
- IIdType l2id = ourClient.create().resource(l2).execute().getId();
+ IIdType l2id = myClient.create().resource(l2).execute().getId();
Encounter e1 = new Encounter();
e1.addIdentifier().setSystem("urn:foo").setValue("testDeepChainingE1");
@@ -570,10 +582,10 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
EncounterLocationComponent location = e1.addLocation();
location.getLocation().setReferenceElement(l2id.toUnqualifiedVersionless());
location.setPeriod(new Period().setStart(new Date(), TemporalPrecisionEnum.SECOND).setEnd(new Date(), TemporalPrecisionEnum.SECOND));
- IIdType e1id = ourClient.create().resource(e1).execute().getId();
+ IIdType e1id = myClient.create().resource(e1).execute().getId();
//@formatter:off
- Bundle res = ourClient.search()
+ Bundle res = myClient.search()
.forResource(Encounter.class)
.where(Encounter.IDENTIFIER.exactly().systemAndCode("urn:foo", "testDeepChainingE1"))
.include(Encounter.INCLUDE_LOCATION.asRecursive())
@@ -606,7 +618,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
try {
//@formatter:off
- ourClient
+ myClient
.delete()
.resourceConditionalByType(Patient.class)
.where(Patient.IDENTIFIER.exactly().code(methodName))
@@ -615,17 +627,17 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
fail();
} catch (PreconditionFailedException e) {
assertEquals("HTTP 412 Precondition Failed: Failed to DELETE resource with match URL \"Patient?identifier=testDeleteConditionalMultiple\" because this search matched 2 resources",
- e.getMessage());
+ e.getMessage());
}
// Not deleted yet..
- ourClient.read().resource("Patient").withId(id1).execute();
- ourClient.read().resource("Patient").withId(id2).execute();
+ myClient.read().resource("Patient").withId(id1).execute();
+ myClient.read().resource("Patient").withId(id2).execute();
myDaoConfig.setAllowMultipleDelete(true);
//@formatter:off
- IBaseOperationOutcome response = ourClient
+ IBaseOperationOutcome response = myClient
.delete()
.resourceConditionalByType(Patient.class)
.where(Patient.IDENTIFIER.exactly().code(methodName))
@@ -635,15 +647,15 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
String encoded = myFhirCtx.newXmlParser().encodeResourceToString(response);
ourLog.info(encoded);
assertThat(encoded, containsString(
- " ids = toUnqualifiedVersionlessIds(b);
assertThat(ids, containsInAnyOrder(patientId, encId, orgId1, orgId2, orgId1parent, locPId, locCId, obsId, devId));
@@ -968,52 +980,52 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Organization org1parent = new Organization();
org1parent.setId("org1parent");
org1parent.setName(methodName + "1parent");
- IIdType orgId1parent = ourClient.update().resource(org1parent).execute().getId().toUnqualifiedVersionless();
+ IIdType orgId1parent = myClient.update().resource(org1parent).execute().getId().toUnqualifiedVersionless();
Organization org1 = new Organization();
org1.setName(methodName + "1");
org1.getPartOf().setReferenceElement(orgId1parent);
- IIdType orgId1 = ourClient.create().resource(org1).execute().getId().toUnqualifiedVersionless();
+ IIdType orgId1 = myClient.create().resource(org1).execute().getId().toUnqualifiedVersionless();
Patient p = new Patient();
p.addName().setFamily(methodName);
p.getManagingOrganization().setReferenceElement(orgId1);
- IIdType patientId = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
+ IIdType patientId = myClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
Organization org2 = new Organization();
org2.setName(methodName + "1");
- IIdType orgId2 = ourClient.create().resource(org2).execute().getId().toUnqualifiedVersionless();
+ IIdType orgId2 = myClient.create().resource(org2).execute().getId().toUnqualifiedVersionless();
Device dev = new Device();
dev.setModel(methodName);
dev.getOwner().setReferenceElement(orgId2);
- IIdType devId = ourClient.create().resource(dev).execute().getId().toUnqualifiedVersionless();
+ IIdType devId = myClient.create().resource(dev).execute().getId().toUnqualifiedVersionless();
Location locParent = new Location();
locParent.setName(methodName + "Parent");
- IIdType locPId = ourClient.create().resource(locParent).execute().getId().toUnqualifiedVersionless();
+ IIdType locPId = myClient.create().resource(locParent).execute().getId().toUnqualifiedVersionless();
Location locChild = new Location();
locChild.setName(methodName);
locChild.getPartOf().setReferenceElement(locPId);
- IIdType locCId = ourClient.create().resource(locChild).execute().getId().toUnqualifiedVersionless();
+ IIdType locCId = myClient.create().resource(locChild).execute().getId().toUnqualifiedVersionless();
Encounter encU = new Encounter();
encU.addIdentifier().setValue(methodName);
- IIdType encUId = ourClient.create().resource(encU).execute().getId().toUnqualifiedVersionless();
+ IIdType encUId = myClient.create().resource(encU).execute().getId().toUnqualifiedVersionless();
Encounter enc = new Encounter();
enc.getSubject().setReferenceElement(patientId);
enc.addLocation().getLocation().setReferenceElement(locCId);
- IIdType encId = ourClient.create().resource(enc).execute().getId().toUnqualifiedVersionless();
+ IIdType encId = myClient.create().resource(enc).execute().getId().toUnqualifiedVersionless();
Observation obs = new Observation();
obs.getSubject().setReferenceElement(patientId);
obs.getDevice().setReferenceElement(devId);
obs.getContext().setReferenceElement(encId);
- IIdType obsId = ourClient.create().resource(obs).execute().getId().toUnqualifiedVersionless();
+ IIdType obsId = myClient.create().resource(obs).execute().getId().toUnqualifiedVersionless();
- Parameters output = ourClient.operation().onType(Encounter.class).named("everything").withNoParameters(Parameters.class).execute();
+ Parameters output = myClient.operation().onType(Encounter.class).named("everything").withNoParameters(Parameters.class).execute();
Bundle b = (Bundle) output.getParameter().get(0).getResource();
List ids = toUnqualifiedVersionlessIds(b);
assertThat(ids, containsInAnyOrder(patientId, encUId, encId, orgId1, orgId2, orgId1parent, locPId, locCId, obsId, devId));
@@ -1062,13 +1074,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
List actual;
StringAndListParam param;
- ourLog.info("Pt1:{} Pt2:{} Obs1:{} Obs2:{} Obs3:{}", new Object[] { ptId1.getIdPart(), ptId2.getIdPart(), obsId1.getIdPart(), obsId2.getIdPart(), obsId3.getIdPart() });
+ ourLog.info("Pt1:{} Pt2:{} Obs1:{} Obs2:{} Obs3:{}", new Object[]{ptId1.getIdPart(), ptId2.getIdPart(), obsId1.getIdPart(), obsId2.getIdPart(), obsId3.getIdPart()});
param = new StringAndListParam();
param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1")));
//@formatter:off
- Parameters response = ourClient
+ Parameters response = myClient
.operation()
.onInstance(ptId1)
.named("everything")
@@ -1090,7 +1102,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
IParser parser = myFhirCtx.newJsonParser();
b = parser.parseResource(Bundle.class, new InputStreamReader(ResourceProviderR4Test.class.getResourceAsStream("/r4/bug147-bundle.json")));
- Bundle resp = ourClient.transaction().withBundle(b).execute();
+ Bundle resp = myClient.transaction().withBundle(b).execute();
List ids = new ArrayList();
for (BundleEntryComponent next : resp.getEntry()) {
IdType toAdd = new IdType(next.getResponse().getLocation()).toUnqualifiedVersionless();
@@ -1102,7 +1114,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals("Patient", patientId.getResourceType());
{
- Parameters output = ourClient.operation().onInstance(patientId).named("everything").withNoParameters(Parameters.class).execute();
+ Parameters output = myClient.operation().onInstance(patientId).named("everything").withNoParameters(Parameters.class).execute();
b = (Bundle) output.getParameter().get(0).getResource();
ids = new ArrayList();
@@ -1123,7 +1135,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
{
Parameters input = new Parameters();
input.addParameter().setName(Constants.PARAM_COUNT).setValue(new UnsignedIntType(100));
- Parameters output = ourClient.operation().onInstance(patientId).named("everything").withParameters(input).execute();
+ Parameters output = myClient.operation().onInstance(patientId).named("everything").withParameters(input).execute();
b = (Bundle) output.getParameter().get(0).getResource();
ids = new ArrayList();
@@ -1161,7 +1173,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
mo.setMedication(new Reference(medId));
IIdType moId = myMedicationRequestDao.create(mo, mySrd).getId().toUnqualifiedVersionless();
- Parameters output = ourClient.operation().onInstance(patId).named("everything").withNoParameters(Parameters.class).execute();
+ Parameters output = myClient.operation().onInstance(patId).named("everything").withNoParameters(Parameters.class).execute();
Bundle b = (Bundle) output.getParameter().get(0).getResource();
List ids = toUnqualifiedVersionlessIds(b);
ourLog.info(ids.toString());
@@ -1182,14 +1194,14 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
c.getSubject().setReference("Patient/1");
b.addEntry().setResource(c).getRequest().setMethod(HTTPVerb.POST);
- Bundle resp = ourClient.transaction().withBundle(b).execute();
+ Bundle resp = myClient.transaction().withBundle(b).execute();
ourLog.info(myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(resp));
IdType patientId = new IdType(resp.getEntry().get(0).getResponse().getLocation());
assertEquals("Patient", patientId.getResourceType());
- Parameters output = ourClient.operation().onInstance(patientId).named("everything").withNoParameters(Parameters.class).execute();
+ Parameters output = myClient.operation().onInstance(patientId).named("everything").withNoParameters(Parameters.class).execute();
b = (Bundle) output.getParameter().get(0).getResource();
List ids = new ArrayList();
@@ -1210,37 +1222,37 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Organization org1parent = new Organization();
org1parent.setId("org1parent");
org1parent.setName(methodName + "1parent");
- IIdType orgId1parent = ourClient.update().resource(org1parent).execute().getId().toUnqualifiedVersionless();
+ IIdType orgId1parent = myClient.update().resource(org1parent).execute().getId().toUnqualifiedVersionless();
Organization org1 = new Organization();
org1.setName(methodName + "1");
org1.getPartOf().setReferenceElement(orgId1parent);
- IIdType orgId1 = ourClient.create().resource(org1).execute().getId().toUnqualifiedVersionless();
+ IIdType orgId1 = myClient.create().resource(org1).execute().getId().toUnqualifiedVersionless();
Patient p = new Patient();
p.addName().setFamily(methodName);
p.getManagingOrganization().setReferenceElement(orgId1);
- IIdType patientId = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
+ IIdType patientId = myClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
Organization org2 = new Organization();
org2.setName(methodName + "1");
- IIdType orgId2 = ourClient.create().resource(org2).execute().getId().toUnqualifiedVersionless();
+ IIdType orgId2 = myClient.create().resource(org2).execute().getId().toUnqualifiedVersionless();
Device dev = new Device();
dev.setModel(methodName);
dev.getOwner().setReferenceElement(orgId2);
- IIdType devId = ourClient.create().resource(dev).execute().getId().toUnqualifiedVersionless();
+ IIdType devId = myClient.create().resource(dev).execute().getId().toUnqualifiedVersionless();
Observation obs = new Observation();
obs.getSubject().setReferenceElement(patientId);
obs.getDevice().setReferenceElement(devId);
- IIdType obsId = ourClient.create().resource(obs).execute().getId().toUnqualifiedVersionless();
+ IIdType obsId = myClient.create().resource(obs).execute().getId().toUnqualifiedVersionless();
Encounter enc = new Encounter();
enc.getSubject().setReferenceElement(patientId);
- IIdType encId = ourClient.create().resource(enc).execute().getId().toUnqualifiedVersionless();
+ IIdType encId = myClient.create().resource(enc).execute().getId().toUnqualifiedVersionless();
- Parameters output = ourClient.operation().onInstance(patientId).named("everything").withNoParameters(Parameters.class).execute();
+ Parameters output = myClient.operation().onInstance(patientId).named("everything").withNoParameters(Parameters.class).execute();
Bundle b = (Bundle) output.getParameter().get(0).getResource();
List ids = toUnqualifiedVersionlessIds(b);
assertThat(ids, containsInAnyOrder(patientId, devId, obsId, encId, orgId1, orgId2, orgId1parent));
@@ -1254,32 +1266,32 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Organization o1 = new Organization();
o1.setName(methodName + "1");
- IIdType o1Id = ourClient.create().resource(o1).execute().getId().toUnqualifiedVersionless();
+ IIdType o1Id = myClient.create().resource(o1).execute().getId().toUnqualifiedVersionless();
Organization o2 = new Organization();
o2.setName(methodName + "2");
- IIdType o2Id = ourClient.create().resource(o2).execute().getId().toUnqualifiedVersionless();
+ IIdType o2Id = myClient.create().resource(o2).execute().getId().toUnqualifiedVersionless();
Patient p1 = new Patient();
p1.addName().setFamily(methodName + "1");
p1.getManagingOrganization().setReferenceElement(o1Id);
- IIdType p1Id = ourClient.create().resource(p1).execute().getId().toUnqualifiedVersionless();
+ IIdType p1Id = myClient.create().resource(p1).execute().getId().toUnqualifiedVersionless();
Patient p2 = new Patient();
p2.addName().setFamily(methodName + "2");
p2.getManagingOrganization().setReferenceElement(o2Id);
- IIdType p2Id = ourClient.create().resource(p2).execute().getId().toUnqualifiedVersionless();
+ IIdType p2Id = myClient.create().resource(p2).execute().getId().toUnqualifiedVersionless();
Condition c1 = new Condition();
c1.getSubject().setReferenceElement(p1Id);
- IIdType c1Id = ourClient.create().resource(c1).execute().getId().toUnqualifiedVersionless();
+ IIdType c1Id = myClient.create().resource(c1).execute().getId().toUnqualifiedVersionless();
Condition c2 = new Condition();
c2.getSubject().setReferenceElement(p2Id);
- IIdType c2Id = ourClient.create().resource(c2).execute().getId().toUnqualifiedVersionless();
+ IIdType c2Id = myClient.create().resource(c2).execute().getId().toUnqualifiedVersionless();
Condition c3 = new Condition();
c3.addIdentifier().setValue(methodName + "3");
- IIdType c3Id = ourClient.create().resource(c3).execute().getId().toUnqualifiedVersionless();
+ IIdType c3Id = myClient.create().resource(c3).execute().getId().toUnqualifiedVersionless();
- Parameters output = ourClient.operation().onType(Patient.class).named("everything").withNoParameters(Parameters.class).execute();
+ Parameters output = myClient.operation().onType(Patient.class).named("everything").withNoParameters(Parameters.class).execute();
Bundle b = (Bundle) output.getParameter().get(0).getResource();
assertEquals(BundleType.SEARCHSET, b.getType());
@@ -1296,7 +1308,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Organization org = new Organization();
org.setName(methodName);
- IIdType oId = ourClient.create().resource(org).execute().getId().toUnqualifiedVersionless();
+ IIdType oId = myClient.create().resource(org).execute().getId().toUnqualifiedVersionless();
long time1 = System.currentTimeMillis();
Thread.sleep(10);
@@ -1304,7 +1316,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient p = new Patient();
p.addName().setFamily(methodName);
p.getManagingOrganization().setReferenceElement(oId);
- IIdType pId = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
+ IIdType pId = myClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
long time2 = System.currentTimeMillis();
Thread.sleep(10);
@@ -1312,7 +1324,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Condition c = new Condition();
c.getCode().setText(methodName);
c.getSubject().setReferenceElement(pId);
- IIdType cId = ourClient.create().resource(c).execute().getId().toUnqualifiedVersionless();
+ IIdType cId = myClient.create().resource(c).execute().getId().toUnqualifiedVersionless();
Thread.sleep(10);
long time3 = System.currentTimeMillis();
@@ -1334,7 +1346,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
get = new HttpGet(ourServerBase + "/Patient/" + pId.getIdPart() + "/$everything?_lastUpdated=%3E" + new InstantType(new Date(time2)).getValueAsString() + "&_lastUpdated=%3C"
- + new InstantType(new Date(time3)).getValueAsString());
+ + new InstantType(new Date(time3)).getValueAsString());
response = ourHttpClient.execute(get);
try {
assertEquals(200, response.getStatusLine().getStatusCode());
@@ -1406,14 +1418,14 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
mySystemDao.transaction(mySrd, inputBundle);
- Bundle responseBundle = ourClient
- .operation()
- .onInstance(new IdType("Patient/A161443"))
- .named("everything")
- .withParameter(Parameters.class, "_count", new IntegerType(20))
- .useHttpGet()
- .returnResourceType(Bundle.class)
- .execute();
+ Bundle responseBundle = myClient
+ .operation()
+ .onInstance(new IdType("Patient/A161443"))
+ .named("everything")
+ .withParameter(Parameters.class, "_count", new IntegerType(20))
+ .useHttpGet()
+ .returnResourceType(Bundle.class)
+ .execute();
ourLog.info(myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(responseBundle));
@@ -1434,7 +1446,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
String nextUrl = responseBundle.getLink("next").getUrl();
- responseBundle = ourClient.fetchResourceFromUrl(Bundle.class, nextUrl);
+ responseBundle = myClient.fetchResourceFromUrl(Bundle.class, nextUrl);
for (int i = 0; i < responseBundle.getEntry().size(); i++) {
for (BundleEntryComponent nextEntry : responseBundle.getEntry()) {
idsSet.add(nextEntry.getResource().getIdElement().toUnqualifiedVersionless().getValue());
@@ -1442,7 +1454,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
nextUrl = responseBundle.getLink("next").getUrl();
- responseBundle = ourClient.fetchResourceFromUrl(Bundle.class, nextUrl);
+ responseBundle = myClient.fetchResourceFromUrl(Bundle.class, nextUrl);
for (int i = 0; i < responseBundle.getEntry().size(); i++) {
for (BundleEntryComponent nextEntry : responseBundle.getEntry()) {
idsSet.add(nextEntry.getResource().getIdElement().toUnqualifiedVersionless().getValue());
@@ -1468,17 +1480,17 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void testEverythingWithLargeSet2() throws Exception {
Patient p = new Patient();
p.setActive(true);
- IIdType id = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
+ IIdType id = myClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
for (int i = 1; i < 77; i++) {
Observation obs = new Observation();
obs.setId("A" + StringUtils.leftPad(Integer.toString(i), 2, '0'));
obs.setSubject(new Reference(id));
- ourClient.update().resource(obs).execute();
+ myClient.update().resource(obs).execute();
}
- Bundle responseBundle = ourClient.operation().onInstance(id).named("everything").withParameter(Parameters.class, "_count", new IntegerType(50)).useHttpGet().returnResourceType(Bundle.class)
- .execute();
+ Bundle responseBundle = myClient.operation().onInstance(id).named("everything").withParameter(Parameters.class, "_count", new IntegerType(50)).useHttpGet().returnResourceType(Bundle.class)
+ .execute();
TreeSet ids = new TreeSet();
for (int i = 0; i < responseBundle.getEntry().size(); i++) {
@@ -1492,7 +1504,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
BundleLinkComponent nextLink = responseBundle.getLink("next");
while (nextLink != null) {
String nextUrl = nextLink.getUrl();
- responseBundle = ourClient.fetchResourceFromUrl(Bundle.class, nextUrl);
+ responseBundle = myClient.fetchResourceFromUrl(Bundle.class, nextUrl);
for (int i = 0; i < responseBundle.getEntry().size(); i++) {
for (BundleEntryComponent nextEntry : responseBundle.getEntry()) {
ids.add(nextEntry.getResource().getIdElement().getIdPart());
@@ -1514,17 +1526,17 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void testEverythingWithOnlyPatient() {
Patient p = new Patient();
p.setActive(true);
- IIdType id = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
+ IIdType id = myClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
myFhirCtx.getRestfulClientFactory().setSocketTimeout(300 * 1000);
- Bundle response = ourClient
- .operation()
- .onInstance(id)
- .named("everything")
- .withNoParameters(Parameters.class)
- .returnResourceType(Bundle.class)
- .execute();
+ Bundle response = myClient
+ .operation()
+ .onInstance(id)
+ .named("everything")
+ .withNoParameters(Parameters.class)
+ .returnResourceType(Bundle.class)
+ .execute();
assertEquals(1, response.getEntry().size());
}
@@ -1557,38 +1569,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
}
- // private void delete(String theResourceType, String theParamName, String theParamValue) {
- // Bundle resources;
- // do {
- // IQuery forResource = ourClient.search().forResource(theResourceType);
- // if (theParamName != null) {
- // forResource = forResource.where(new StringClientParam(theParamName).matches().value(theParamValue));
- // }
- // resources = forResource.execute();
- // for (IResource next : resources.toListOfResources()) {
- // ourLog.info("Deleting resource: {}", next.getId());
- // ourClient.delete().resource(next).execute();
- // }
- // } while (resources.size() > 0);
- // }
- //
- // private void deleteToken(String theResourceType, String theParamName, String theParamSystem, String theParamValue)
- // {
- // Bundle resources = ourClient.search().forResource(theResourceType).where(new
- // TokenClientParam(theParamName).exactly().systemAndCode(theParamSystem, theParamValue)).execute();
- // for (IResource next : resources.toListOfResources()) {
- // ourLog.info("Deleting resource: {}", next.getId());
- // ourClient.delete().resource(next).execute();
- // }
- // }
-
@Test
public void testGetResourceCountsOperation() throws Exception {
String methodName = "testMetaOperations";
Patient pt = new Patient();
pt.addName().setFamily(methodName);
- ourClient.create().resource(pt).execute().getId().toUnqualifiedVersionless();
+ myClient.create().resource(pt).execute().getId().toUnqualifiedVersionless();
HttpGet get = new HttpGet(ourServerBase + "/$get-resource-counts");
CloseableHttpResponse response = ourHttpClient.execute(get);
@@ -1603,6 +1590,31 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
}
+ // private void delete(String theResourceType, String theParamName, String theParamValue) {
+ // Bundle resources;
+ // do {
+ // IQuery forResource = myClient.search().forResource(theResourceType);
+ // if (theParamName != null) {
+ // forResource = forResource.where(new StringClientParam(theParamName).matches().value(theParamValue));
+ // }
+ // resources = forResource.execute();
+ // for (IResource next : resources.toListOfResources()) {
+ // ourLog.info("Deleting resource: {}", next.getId());
+ // myClient.delete().resource(next).execute();
+ // }
+ // } while (resources.size() > 0);
+ // }
+ //
+ // private void deleteToken(String theResourceType, String theParamName, String theParamSystem, String theParamValue)
+ // {
+ // Bundle resources = myClient.search().forResource(theResourceType).where(new
+ // TokenClientParam(theParamName).exactly().systemAndCode(theParamSystem, theParamValue)).execute();
+ // for (IResource next : resources.toListOfResources()) {
+ // ourLog.info("Deleting resource: {}", next.getId());
+ // myClient.delete().resource(next).execute();
+ // }
+ // }
+
@Test
public void testHasParameter() throws Exception {
IIdType pid0;
@@ -1639,7 +1651,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
List ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertThat(ids, contains(pid0.getValue()));
}
-
+
@Test
public void testHasParameterNoResults() throws Exception {
@@ -1704,12 +1716,12 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient patient = new Patient();
patient.addName().setFamily(methodName);
- IIdType id = ourClient.create().resource(patient).execute().getId().toVersionless();
- ourClient.delete().resourceById(id).execute();
+ IIdType id = myClient.create().resource(patient).execute().getId().toVersionless();
+ myClient.delete().resourceById(id).execute();
patient.setId(id);
- ourClient.update().resource(patient).execute();
+ myClient.update().resource(patient).execute();
- Bundle history = ourClient.history().onInstance(id).andReturnBundle(Bundle.class).prettyPrint().summaryMode(SummaryEnum.DATA).execute();
+ Bundle history = myClient.history().onInstance(id).andReturnBundle(Bundle.class).prettyPrint().summaryMode(SummaryEnum.DATA).execute();
assertEquals(3, history.getEntry().size());
assertEquals(id.withVersion("3").getValue(), history.getEntry().get(0).getResource().getId());
assertEquals(1, ((Patient) history.getEntry().get(0).getResource()).getName().size());
@@ -1810,9 +1822,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(400, response.getStatusLine().getStatusCode());
OperationOutcome oo = myFhirCtx.newXmlParser().parseResource(OperationOutcome.class, respString);
assertEquals(
- "Can not update resource, resource body must contain an ID element which matches the request URL for update (PUT) operation - Resource body ID of \"AAA\" does not match URL ID of \""
- + id.getIdPart() + "\"",
- oo.getIssue().get(0).getDiagnostics());
+ "Can not update resource, resource body must contain an ID element which matches the request URL for update (PUT) operation - Resource body ID of \"AAA\" does not match URL ID of \""
+ + id.getIdPart() + "\"",
+ oo.getIssue().get(0).getDiagnostics());
} finally {
response.close();
}
@@ -1824,7 +1836,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
*/
@Test
public void testImagingStudyResources() throws Exception {
- IGenericClient client = ourClient;
+ IGenericClient client = myClient;
int initialSize = client.search().forResource(ImagingStudy.class).returnBundle(Bundle.class).execute().getEntry().size();
@@ -1843,9 +1855,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient p = new Patient();
p.getManagingOrganization().setReference("http://example.com/Organization/123");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
- Bundle b = ourClient.search().forResource("Patient").include(Patient.INCLUDE_ORGANIZATION).returnBundle(Bundle.class).execute();
+ Bundle b = myClient.search().forResource("Patient").include(Patient.INCLUDE_ORGANIZATION).returnBundle(Bundle.class).execute();
assertEquals(1, b.getEntry().size());
}
@@ -1853,18 +1865,18 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void testMetaOperationWithNoMetaParameter() throws Exception {
Patient p = new Patient();
p.addName().setFamily("testMetaAddInvalid");
- IIdType id = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
+ IIdType id = myClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
//@formatter:off
String input = "\n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " \n" +
- " ";
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ "";
//@formatter:on
HttpPost post = new HttpPost(ourServerBase + "/Patient/" + id.getIdPart() + "/$meta-add");
@@ -1899,19 +1911,19 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient pt = new Patient();
pt.addName().setFamily(methodName);
- IIdType id = ourClient.create().resource(pt).execute().getId().toUnqualifiedVersionless();
+ IIdType id = myClient.create().resource(pt).execute().getId().toUnqualifiedVersionless();
- Meta meta = ourClient.meta().get(Meta.class).fromResource(id).execute();
+ Meta meta = myClient.meta().get(Meta.class).fromResource(id).execute();
assertEquals(0, meta.getTag().size());
Meta inMeta = new Meta();
inMeta.addTag().setSystem("urn:system1").setCode("urn:code1");
- meta = ourClient.meta().add().onResource(id).meta(inMeta).execute();
+ meta = myClient.meta().add().onResource(id).meta(inMeta).execute();
assertEquals(1, meta.getTag().size());
inMeta = new Meta();
inMeta.addTag().setSystem("urn:system1").setCode("urn:code1");
- meta = ourClient.meta().delete().onResource(id).meta(inMeta).execute();
+ meta = myClient.meta().delete().onResource(id).meta(inMeta).execute();
assertEquals(0, meta.getTag().size());
}
@@ -1937,14 +1949,14 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
StructureDefinition p = new StructureDefinition();
p.setAbstract(true);
p.setUrl("http://example.com/foo");
- IIdType id = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
+ IIdType id = myClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
- Bundle resp = ourClient
- .search()
- .forResource(StructureDefinition.class)
- .where(StructureDefinition.URL.matches().value("http://example.com/foo"))
- .returnBundle(Bundle.class)
- .execute();
+ Bundle resp = myClient
+ .search()
+ .forResource(StructureDefinition.class)
+ .where(StructureDefinition.URL.matches().value("http://example.com/foo"))
+ .returnBundle(Bundle.class)
+ .execute();
assertEquals(1, resp.getTotal());
}
@@ -1966,7 +1978,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(10);
mySearchCoordinatorSvcRaw.setNeverUseLocalSearchForUnitTests(true);
- Bundle response = ourClient
+ Bundle response = myClient
.operation()
.onInstance(new IdType(pid))
.named("everything")
@@ -1984,7 +1996,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
// Load page 2
String nextUrl = response.getLink("next").getUrl();
- response = ourClient.fetchResourceFromUrl(Bundle.class, nextUrl);
+ response = myClient.fetchResourceFromUrl(Bundle.class, nextUrl);
assertEquals(10, response.getEntry().size());
if (response.getTotalElement().getValueAsString() != null) {
@@ -1996,7 +2008,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Thread.sleep(2000);
nextUrl = response.getLink("next").getUrl();
- response = ourClient.fetchResourceFromUrl(Bundle.class, nextUrl);
+ response = myClient.fetchResourceFromUrl(Bundle.class, nextUrl);
assertEquals(1, response.getEntry().size());
assertEquals("21", response.getTotalElement().getValueAsString());
@@ -2023,7 +2035,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(10);
mySearchCoordinatorSvcRaw.setNeverUseLocalSearchForUnitTests(true);
- Bundle response = ourClient
+ Bundle response = myClient
.operation()
.onInstance(new IdType(pid))
.named("everything")
@@ -2063,7 +2075,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
response.close();
}
- Patient newPt = ourClient.read().resource(Patient.class).withId(pid1.getIdPart()).execute();
+ Patient newPt = myClient.read().resource(Patient.class).withId(pid1.getIdPart()).execute();
assertEquals("2", newPt.getIdElement().getVersionIdPart());
assertEquals(false, newPt.getActive());
}
@@ -2094,7 +2106,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
response.close();
}
- Patient newPt = ourClient.read().resource(Patient.class).withId(pid1.getIdPart()).execute();
+ Patient newPt = myClient.read().resource(Patient.class).withId(pid1.getIdPart()).execute();
assertEquals("1", newPt.getIdElement().getVersionIdPart());
assertEquals(true, newPt.getActive());
}
@@ -2125,7 +2137,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
response.close();
}
- Patient newPt = ourClient.read().resource(Patient.class).withId(pid1.getIdPart()).execute();
+ Patient newPt = myClient.read().resource(Patient.class).withId(pid1.getIdPart()).execute();
assertEquals("2", newPt.getIdElement().getVersionIdPart());
assertEquals(false, newPt.getActive());
}
@@ -2156,7 +2168,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
response.close();
}
- Patient newPt = ourClient.read().resource(Patient.class).withId(pid1.getIdPart()).execute();
+ Patient newPt = myClient.read().resource(Patient.class).withId(pid1.getIdPart()).execute();
assertEquals("2", newPt.getIdElement().getVersionIdPart());
assertEquals(false, newPt.getActive());
}
@@ -2165,25 +2177,25 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void testPreserveVersionsOnAuditEvent() {
Organization org = new Organization();
org.setName("ORG");
- IIdType orgId = ourClient.create().resource(org).execute().getId();
+ IIdType orgId = myClient.create().resource(org).execute().getId();
assertEquals("1", orgId.getVersionIdPart());
Patient patient = new Patient();
patient.addIdentifier().setSystem("http://uhn.ca/mrns").setValue("100");
patient.getManagingOrganization().setReference(orgId.toUnqualified().getValue());
- IIdType patientId = ourClient.create().resource(patient).execute().getId();
+ IIdType patientId = myClient.create().resource(patient).execute().getId();
assertEquals("1", patientId.getVersionIdPart());
AuditEvent ae = new org.hl7.fhir.r4.model.AuditEvent();
ae.addEntity().getReference().setReference(patientId.toUnqualified().getValue());
- IIdType aeId = ourClient.create().resource(ae).execute().getId();
+ IIdType aeId = myClient.create().resource(ae).execute().getId();
assertEquals("1", aeId.getVersionIdPart());
- patient = ourClient.read().resource(Patient.class).withId(patientId).execute();
+ patient = myClient.read().resource(Patient.class).withId(patientId).execute();
assertTrue(patient.getManagingOrganization().getReferenceElement().hasIdPart());
assertFalse(patient.getManagingOrganization().getReferenceElement().hasVersionIdPart());
- ae = ourClient.read().resource(AuditEvent.class).withId(aeId).execute();
+ ae = myClient.read().resource(AuditEvent.class).withId(aeId).execute();
assertTrue(ae.getEntityFirstRep().getReference().getReferenceElement().hasIdPart());
assertTrue(ae.getEntityFirstRep().getReference().getReferenceElement().hasVersionIdPart());
@@ -2194,7 +2206,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
*/
@Test
public void testProcedureRequestResources() throws Exception {
- IGenericClient client = ourClient;
+ IGenericClient client = myClient;
int initialSize = client.search().forResource(ProcedureRequest.class).returnBundle(Bundle.class).execute().getEntry().size();
@@ -2218,19 +2230,19 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
pat = new Patient();
pat.addIdentifier().setSystem("urn:system").setValue("testReadAllInstancesOfType_01");
- ourClient.create().resource(pat).prettyPrint().encodedXml().execute().getId();
+ myClient.create().resource(pat).prettyPrint().encodedXml().execute().getId();
pat = new Patient();
pat.addIdentifier().setSystem("urn:system").setValue("testReadAllInstancesOfType_02");
- ourClient.create().resource(pat).prettyPrint().encodedXml().execute().getId();
+ myClient.create().resource(pat).prettyPrint().encodedXml().execute().getId();
{
- Bundle returned = ourClient.search().forResource(Patient.class).encodedXml().returnBundle(Bundle.class).execute();
+ Bundle returned = myClient.search().forResource(Patient.class).encodedXml().returnBundle(Bundle.class).execute();
assertThat(returned.getEntry().size(), greaterThan(1));
assertEquals(BundleType.SEARCHSET, returned.getType());
}
{
- Bundle returned = ourClient.search().forResource(Patient.class).encodedJson().returnBundle(Bundle.class).execute();
+ Bundle returned = myClient.search().forResource(Patient.class).encodedJson().returnBundle(Bundle.class).execute();
assertThat(returned.getEntry().size(), greaterThan(1));
}
}
@@ -2242,9 +2254,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
p1.getText().getDiv().setValueAsString("HELLO WORLD");
p1.addIdentifier().setSystem("urn:system").setValue("testSaveAndRetrieveExistingNarrative01");
- IIdType newId = ourClient.create().resource(p1).encodedJson().execute().getId();
+ IIdType newId = myClient.create().resource(p1).encodedJson().execute().getId();
- Patient actual = ourClient.read().resource(Patient.class).withId(newId).encodedJson().execute();
+ Patient actual = myClient.read().resource(Patient.class).withId(newId).encodedJson().execute();
assertEquals("HELLO WORLD", actual.getText().getDiv().getValueAsString());
}
@@ -2255,9 +2267,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
p1.getText().getDiv().setValueAsString("HELLO WORLD");
p1.addIdentifier().setSystem("urn:system").setValue("testSaveAndRetrieveExistingNarrative01");
- IIdType newId = ourClient.create().resource(p1).encodedXml().execute().getId();
+ IIdType newId = myClient.create().resource(p1).encodedXml().execute().getId();
- Patient actual = ourClient.read().resource(Patient.class).withId(newId).encodedXml().execute();
+ Patient actual = myClient.read().resource(Patient.class).withId(newId).encodedXml().execute();
assertEquals("HELLO WORLD", actual.getText().getDiv().getValueAsString());
}
@@ -2266,13 +2278,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient nextPatient = new Patient();
nextPatient.setId("Patient/B");
nextPatient
- .addExtension()
- .setUrl("http://foo")
- .setValue(new Reference("Practitioner/A"));
+ .addExtension()
+ .setUrl("http://foo")
+ .setValue(new Reference("Practitioner/A"));
- ourClient.update().resource(nextPatient).execute();
+ myClient.update().resource(nextPatient).execute();
- Patient p = ourClient.read().resource(Patient.class).withId("B").execute();
+ Patient p = myClient.read().resource(Patient.class).withId("B").execute();
String encoded = myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(encoded);
@@ -2290,19 +2302,19 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
p1.getManagingOrganization().setResource(o1);
- IIdType newId = ourClient.create().resource(p1).execute().getId();
+ IIdType newId = myClient.create().resource(p1).execute().getId();
- Patient actual = ourClient.read(Patient.class, new UriDt(newId.getValue()));
+ Patient actual = myClient.read(Patient.class, new UriDt(newId.getValue()));
assertEquals(1, actual.getContained().size());
//@formatter:off
- Bundle b = ourClient
- .search()
- .forResource("Patient")
- .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system:rpdstu2", "testSaveAndRetrieveWithContained01"))
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
+ Bundle b = myClient
+ .search()
+ .forResource("Patient")
+ .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system:rpdstu2", "testSaveAndRetrieveWithContained01"))
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
assertEquals(1, b.getEntry().size());
@@ -2314,9 +2326,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
p1.getText().setDivAsString("Identifier testSearchByResourceChain01 ");
p1.addIdentifier().setSystem("urn:system").setValue("testSearchByResourceChain01");
- IdType newId = (IdType) ourClient.create().resource(p1).execute().getId();
+ IdType newId = (IdType) myClient.create().resource(p1).execute().getId();
- Patient actual = ourClient.read(Patient.class, newId.getIdPart());
+ Patient actual = myClient.read(Patient.class, newId.getIdPart());
assertThat(actual.getText().getDiv().getValueAsString(), containsString("Identifier testSearchByResourceChain01 "));
}
@@ -2382,68 +2394,68 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Bundle found;
- found = ourClient
- .search()
- .forResource(Patient.class)
- .where(BaseResource.RES_ID.exactly().systemAndValues(null, id1.getIdPart(), id2.getIdPart()))
- .returnBundle(Bundle.class)
- .execute();
+ found = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(BaseResource.RES_ID.exactly().systemAndValues(null, id1.getIdPart(), id2.getIdPart()))
+ .returnBundle(Bundle.class)
+ .execute();
assertThat(toUnqualifiedVersionlessIds(found), containsInAnyOrder(id1, id2));
- found = ourClient
- .search()
- .forResource(Patient.class)
- .where(BaseResource.RES_ID.exactly().systemAndValues(null, Arrays.asList(id1.getIdPart(), id2.getIdPart(), "FOOOOO")))
- .returnBundle(Bundle.class)
- .execute();
+ found = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(BaseResource.RES_ID.exactly().systemAndValues(null, Arrays.asList(id1.getIdPart(), id2.getIdPart(), "FOOOOO")))
+ .returnBundle(Bundle.class)
+ .execute();
assertThat(toUnqualifiedVersionlessIds(found), containsInAnyOrder(id1, id2));
- found = ourClient
- .search()
- .forResource(Patient.class)
- .where(BaseResource.RES_ID.exactly().systemAndCode(null, id1.getIdPart()))
- .returnBundle(Bundle.class)
- .execute();
+ found = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(BaseResource.RES_ID.exactly().systemAndCode(null, id1.getIdPart()))
+ .returnBundle(Bundle.class)
+ .execute();
assertThat(toUnqualifiedVersionlessIds(found), containsInAnyOrder(id1));
- found = ourClient
- .search()
- .forResource(Patient.class)
- .where(BaseResource.RES_ID.exactly().codes(id1.getIdPart(), id2.getIdPart()))
- .and(BaseResource.RES_ID.exactly().code(id1.getIdPart()))
- .returnBundle(Bundle.class)
- .execute();
+ found = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(BaseResource.RES_ID.exactly().codes(id1.getIdPart(), id2.getIdPart()))
+ .and(BaseResource.RES_ID.exactly().code(id1.getIdPart()))
+ .returnBundle(Bundle.class)
+ .execute();
assertThat(toUnqualifiedVersionlessIds(found), containsInAnyOrder(id1));
- found = ourClient
- .search()
- .forResource(Patient.class)
- .where(BaseResource.RES_ID.exactly().codes(Arrays.asList(id1.getIdPart(), id2.getIdPart(), "FOOOOO")))
- .and(BaseResource.RES_ID.exactly().code(id1.getIdPart()))
- .returnBundle(Bundle.class)
- .execute();
+ found = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(BaseResource.RES_ID.exactly().codes(Arrays.asList(id1.getIdPart(), id2.getIdPart(), "FOOOOO")))
+ .and(BaseResource.RES_ID.exactly().code(id1.getIdPart()))
+ .returnBundle(Bundle.class)
+ .execute();
assertThat(toUnqualifiedVersionlessIds(found), containsInAnyOrder(id1));
- found = ourClient
- .search()
- .forResource(Patient.class)
- .where(BaseResource.RES_ID.exactly().codes(id1.getIdPart(), id2.getIdPart(), "FOOO"))
- .returnBundle(Bundle.class)
- .execute();
+ found = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(BaseResource.RES_ID.exactly().codes(id1.getIdPart(), id2.getIdPart(), "FOOO"))
+ .returnBundle(Bundle.class)
+ .execute();
assertThat(toUnqualifiedVersionlessIds(found), containsInAnyOrder(id1, id2));
- found = ourClient
- .search()
- .forResource(Patient.class)
- .where(BaseResource.RES_ID.exactly().codes("FOOO"))
- .returnBundle(Bundle.class)
- .execute();
+ found = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(BaseResource.RES_ID.exactly().codes("FOOO"))
+ .returnBundle(Bundle.class)
+ .execute();
assertThat(toUnqualifiedVersionlessIds(found), empty());
@@ -2454,22 +2466,22 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient p1 = new Patient();
p1.addIdentifier().setSystem("urn:system").setValue("testSearchByIdentifier01");
p1.addName().setFamily("testSearchByIdentifierFamily01").addGiven("testSearchByIdentifierGiven01");
- IdType p1Id = (IdType) ourClient.create().resource(p1).execute().getId();
+ IdType p1Id = (IdType) myClient.create().resource(p1).execute().getId();
Patient p2 = new Patient();
p2.addIdentifier().setSystem("urn:system").setValue("testSearchByIdentifier02");
p2.addName().setFamily("testSearchByIdentifierFamily01").addGiven("testSearchByIdentifierGiven02");
- ourClient.create().resource(p2).execute().getId();
+ myClient.create().resource(p2).execute().getId();
//@formatter:off
- Bundle actual = ourClient
- .search()
- .forResource(Patient.class)
- .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system", "testSearchByIdentifier01"))
- .encodedJson()
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
+ Bundle actual = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system", "testSearchByIdentifier01"))
+ .encodedJson()
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
assertEquals(1, actual.getEntry().size());
@@ -2483,17 +2495,17 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient p1 = new Patient();
p1.addIdentifier().setValue("testSearchByIdentifierWithoutSystem01");
- IdType p1Id = (IdType) ourClient.create().resource(p1).execute().getId();
+ IdType p1Id = (IdType) myClient.create().resource(p1).execute().getId();
//@formatter:off
- Bundle actual = ourClient
- .search()
- .forResource(Patient.class)
- .where(Patient.IDENTIFIER.exactly().systemAndCode(null, "testSearchByIdentifierWithoutSystem01"))
- .encodedJson()
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
+ Bundle actual = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(Patient.IDENTIFIER.exactly().systemAndCode(null, "testSearchByIdentifierWithoutSystem01"))
+ .encodedJson()
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
assertEquals(1, actual.getEntry().size());
assertEquals(p1Id.getIdPart(), actual.getEntry().get(0).getResource().getIdElement().getIdPart());
@@ -2505,16 +2517,16 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
String methodName = "testSearchByLastUpdated";
Patient p = new Patient();
- p.addName().setFamily(methodName+"1");
- IIdType pid1 = ourClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
+ p.addName().setFamily(methodName + "1");
+ IIdType pid1 = myClient.create().resource(p).execute().getId().toUnqualifiedVersionless();
Thread.sleep(10);
long time1 = System.currentTimeMillis();
Thread.sleep(10);
Patient p2 = new Patient();
- p2.addName().setFamily(methodName+"2");
- IIdType pid2 = ourClient.create().resource(p2).execute().getId().toUnqualifiedVersionless();
+ p2.addName().setFamily(methodName + "2");
+ IIdType pid2 = myClient.create().resource(p2).execute().getId().toUnqualifiedVersionless();
HttpGet get = new HttpGet(ourServerBase + "/Patient?_lastUpdated=lt" + new InstantType(new Date(time1)).getValueAsString());
CloseableHttpResponse response = ourHttpClient.execute(get);
@@ -2550,28 +2562,28 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void testSearchByReferenceIds() {
Organization o1 = new Organization();
o1.setName("testSearchByResourceChainName01");
- IIdType o1id = ourClient.create().resource(o1).execute().getId().toUnqualifiedVersionless();
+ IIdType o1id = myClient.create().resource(o1).execute().getId().toUnqualifiedVersionless();
Organization o2 = new Organization();
o2.setName("testSearchByResourceChainName02");
- IIdType o2id = ourClient.create().resource(o2).execute().getId().toUnqualifiedVersionless();
+ IIdType o2id = myClient.create().resource(o2).execute().getId().toUnqualifiedVersionless();
Patient p1 = new Patient();
p1.addIdentifier().setSystem("urn:system").setValue("testSearchByReferenceIds01");
p1.addName().setFamily("testSearchByReferenceIdsFamily01").addGiven("testSearchByReferenceIdsGiven01");
p1.setManagingOrganization(new Reference(o1id.toUnqualifiedVersionless()));
- IIdType p1Id = ourClient.create().resource(p1).execute().getId();
+ IIdType p1Id = myClient.create().resource(p1).execute().getId();
Patient p2 = new Patient();
p2.addIdentifier().setSystem("urn:system").setValue("testSearchByReferenceIds02");
p2.addName().setFamily("testSearchByReferenceIdsFamily02").addGiven("testSearchByReferenceIdsGiven02");
p2.setManagingOrganization(new Reference(o2id.toUnqualifiedVersionless()));
- IIdType p2Id = ourClient.create().resource(p2).execute().getId();
+ IIdType p2Id = myClient.create().resource(p2).execute().getId();
//@formatter:off
- Bundle actual = ourClient.search()
- .forResource(Patient.class)
- .where(Patient.ORGANIZATION.hasAnyOfIds(Arrays.asList(o1id.getIdPart(), o2id.getIdPart())))
- .encodedJson().prettyPrint().returnBundle(Bundle.class).execute();
+ Bundle actual = myClient.search()
+ .forResource(Patient.class)
+ .where(Patient.ORGANIZATION.hasAnyOfIds(Arrays.asList(o1id.getIdPart(), o2id.getIdPart())))
+ .encodedJson().prettyPrint().returnBundle(Bundle.class).execute();
//@formatter:on
Set expectedIds = new HashSet();
expectedIds.add(p1Id.getIdPart());
@@ -2588,28 +2600,28 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Organization o1 = new Organization();
o1.setName("testSearchByResourceChainName01");
- IdType o1id = (IdType) ourClient.create().resource(o1).execute().getId().toUnqualifiedVersionless();
+ IdType o1id = (IdType) myClient.create().resource(o1).execute().getId().toUnqualifiedVersionless();
Patient p1 = new Patient();
p1.addIdentifier().setSystem("urn:system").setValue("testSearchByResourceChain01");
p1.addName().setFamily("testSearchByResourceChainFamily01").addGiven("testSearchByResourceChainGiven01");
p1.setManagingOrganization(new Reference(o1id.toUnqualifiedVersionless()));
- IdType p1Id = (IdType) ourClient.create().resource(p1).execute().getId();
+ IdType p1Id = (IdType) myClient.create().resource(p1).execute().getId();
//@formatter:off
- Bundle actual = ourClient.search()
- .forResource(Patient.class)
- .where(Patient.ORGANIZATION.hasId(o1id.getIdPart()))
- .encodedJson().prettyPrint().returnBundle(Bundle.class).execute();
+ Bundle actual = myClient.search()
+ .forResource(Patient.class)
+ .where(Patient.ORGANIZATION.hasId(o1id.getIdPart()))
+ .encodedJson().prettyPrint().returnBundle(Bundle.class).execute();
//@formatter:on
assertEquals(1, actual.getEntry().size());
assertEquals(p1Id.getIdPart(), actual.getEntry().get(0).getResource().getIdElement().getIdPart());
//@formatter:off
- actual = ourClient.search()
- .forResource(Patient.class)
- .where(Patient.ORGANIZATION.hasId(o1id.getValue()))
- .encodedJson().prettyPrint().returnBundle(Bundle.class).execute();
+ actual = myClient.search()
+ .forResource(Patient.class)
+ .where(Patient.ORGANIZATION.hasId(o1id.getValue()))
+ .encodedJson().prettyPrint().returnBundle(Bundle.class).execute();
//@formatter:on
assertEquals(1, actual.getEntry().size());
assertEquals(p1Id.getIdPart(), actual.getEntry().get(0).getResource().getIdElement().getIdPart());
@@ -2651,14 +2663,14 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient patient = new Patient();
patient.addIdentifier().setSystem("urn:system").setValue("001");
patient.addName().setFamily(methodName).addGiven("Joe");
- id1a = (IdType) ourClient.create().resource(patient).execute().getId().toUnqualifiedVersionless();
+ id1a = (IdType) myClient.create().resource(patient).execute().getId().toUnqualifiedVersionless();
}
IIdType id1b;
{
Patient patient = new Patient();
patient.addIdentifier().setSystem("urn:system").setValue("002");
patient.addName().setFamily(methodName + "XXXX").addGiven("Joe");
- id1b = (IdType) ourClient.create().resource(patient).execute().getId().toUnqualifiedVersionless();
+ id1b = (IdType) myClient.create().resource(patient).execute().getId().toUnqualifiedVersionless();
}
Thread.sleep(1100);
@@ -2670,40 +2682,40 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient patient = new Patient();
patient.addIdentifier().setSystem("urn:system").setValue("002");
patient.addName().setFamily(methodName).addGiven("John");
- id2 = (IdType) ourClient.create().resource(patient).execute().getId().toUnqualifiedVersionless();
+ id2 = (IdType) myClient.create().resource(patient).execute().getId().toUnqualifiedVersionless();
}
{
//@formatter:off
- Bundle found = ourClient.search()
- .forResource(Patient.class)
- .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
- .returnBundle(Bundle.class)
- .execute();
+ Bundle found = myClient.search()
+ .forResource(Patient.class)
+ .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
List patients = toUnqualifiedVersionlessIds(found);
assertThat(patients, hasItems(id1a, id1b, id2));
}
{
//@formatter:off
- Bundle found = ourClient.search()
- .forResource(Patient.class)
- .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
- .lastUpdated(new DateRangeParam(beforeAny, null))
- .returnBundle(Bundle.class)
- .execute();
+ Bundle found = myClient.search()
+ .forResource(Patient.class)
+ .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
+ .lastUpdated(new DateRangeParam(beforeAny, null))
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
List patients = toUnqualifiedVersionlessIds(found);
assertThat(patients, hasItems(id1a, id1b, id2));
}
{
//@formatter:off
- Bundle found = ourClient.search()
- .forResource(Patient.class)
- .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
- .lastUpdated(new DateRangeParam(beforeR2, null))
- .returnBundle(Bundle.class)
- .execute();
+ Bundle found = myClient.search()
+ .forResource(Patient.class)
+ .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
+ .lastUpdated(new DateRangeParam(beforeR2, null))
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
List patients = toUnqualifiedVersionlessIds(found);
assertThat(patients, hasItems(id2));
@@ -2711,12 +2723,12 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
{
//@formatter:off
- Bundle found = ourClient.search()
- .forResource(Patient.class)
- .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
- .lastUpdated(new DateRangeParam(beforeAny, beforeR2))
- .returnBundle(Bundle.class)
- .execute();
+ Bundle found = myClient.search()
+ .forResource(Patient.class)
+ .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
+ .lastUpdated(new DateRangeParam(beforeAny, beforeR2))
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
List patients = toUnqualifiedVersionlessIds(found);
assertThat(patients.toString(), patients, not(hasItems(id2)));
@@ -2724,12 +2736,12 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
{
//@formatter:off
- Bundle found = ourClient.search()
- .forResource(Patient.class)
- .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
- .lastUpdated(new DateRangeParam(null, beforeR2))
- .returnBundle(Bundle.class)
- .execute();
+ Bundle found = myClient.search()
+ .forResource(Patient.class)
+ .where(Patient.NAME.matches().value("testSearchLastUpdatedParamRp"))
+ .lastUpdated(new DateRangeParam(null, beforeR2))
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
List patients = toUnqualifiedVersionlessIds(found);
assertThat(patients, (hasItems(id1a, id1b)));
@@ -2809,7 +2821,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
List linkNext = Lists.newArrayList();
for (int i = 0; i < 100; i++) {
- Bundle bundle = ourClient.search().forResource(Patient.class).where(Patient.NAME.matches().value("testSearchPagingKeepsOldSearches")).count(5).returnBundle(Bundle.class).execute();
+ Bundle bundle = myClient.search().forResource(Patient.class).where(Patient.NAME.matches().value("testSearchPagingKeepsOldSearches")).count(5).returnBundle(Bundle.class).execute();
assertTrue(isNotBlank(bundle.getLink("next").getUrl()));
assertEquals(5, bundle.getEntry().size());
linkNext.add(bundle.getLink("next").getUrl());
@@ -2818,7 +2830,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
int index = 0;
for (String nextLink : linkNext) {
ourLog.info("Fetching index {}", index++);
- Bundle b = ourClient.fetchResourceFromUrl(Bundle.class, nextLink);
+ Bundle b = myClient.fetchResourceFromUrl(Bundle.class, nextLink);
assertEquals(5, b.getEntry().size());
}
}
@@ -2842,12 +2854,12 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Thread.sleep(1);
//@formatter:off
- Bundle found = ourClient
- .search()
- .forResource(Patient.class)
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
+ Bundle found = myClient
+ .search()
+ .forResource(Patient.class)
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
Thread.sleep(1);
@@ -2871,23 +2883,23 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
org.setName("HELLO");
resources.add(org);
}
- ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
+ myClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
myDaoConfig.setReuseCachedSearchResultsForMillis(1000L);
- Bundle result1 = ourClient
- .search()
- .forResource("Organization")
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result1 = myClient
+ .search()
+ .forResource("Organization")
+ .returnBundle(Bundle.class)
+ .execute();
final String uuid1 = toSearchUuidFromLinkNext(result1);
- Bundle result2 = ourClient
- .search()
- .forResource("Organization")
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result2 = myClient
+ .search()
+ .forResource("Organization")
+ .returnBundle(Bundle.class)
+ .execute();
final String uuid2 = toSearchUuidFromLinkNext(result2);
@@ -2902,37 +2914,37 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
org.setName("HELLO");
resources.add(org);
}
- ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
+ myClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
myDaoConfig.setReuseCachedSearchResultsForMillis(null);
- Bundle result1 = ourClient
- .search()
- .forResource("Organization")
- .where(Organization.NAME.matches().value("HELLO"))
- .count(5)
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result1 = myClient
+ .search()
+ .forResource("Organization")
+ .where(Organization.NAME.matches().value("HELLO"))
+ .count(5)
+ .returnBundle(Bundle.class)
+ .execute();
final String uuid1 = toSearchUuidFromLinkNext(result1);
- Bundle result2 = ourClient
- .search()
- .forResource("Organization")
- .where(Organization.NAME.matches().value("HELLO"))
- .count(5)
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result2 = myClient
+ .search()
+ .forResource("Organization")
+ .where(Organization.NAME.matches().value("HELLO"))
+ .count(5)
+ .returnBundle(Bundle.class)
+ .execute();
final String uuid2 = toSearchUuidFromLinkNext(result2);
- Bundle result3 = ourClient
- .search()
- .forResource("Organization")
- .where(Organization.NAME.matches().value("HELLO"))
- .count(5)
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result3 = myClient
+ .search()
+ .forResource("Organization")
+ .where(Organization.NAME.matches().value("HELLO"))
+ .count(5)
+ .returnBundle(Bundle.class)
+ .execute();
String uuid3 = toSearchUuidFromLinkNext(result3);
@@ -2948,17 +2960,17 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
org.setName("HELLO");
resources.add(org);
}
- ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
+ myClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
myDaoConfig.setReuseCachedSearchResultsForMillis(1000L);
- Bundle result1 = ourClient
- .search()
- .forResource("Organization")
- .where(Organization.NAME.matches().value("HELLO"))
- .count(5)
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result1 = myClient
+ .search()
+ .forResource("Organization")
+ .where(Organization.NAME.matches().value("HELLO"))
+ .count(5)
+ .returnBundle(Bundle.class)
+ .execute();
final String uuid1 = toSearchUuidFromLinkNext(result1);
Search search1 = newTxTemplate().execute(new TransactionCallback() {
@@ -2969,13 +2981,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
});
Date lastReturned1 = search1.getSearchLastReturned();
- Bundle result2 = ourClient
- .search()
- .forResource("Organization")
- .where(Organization.NAME.matches().value("HELLO"))
- .count(5)
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result2 = myClient
+ .search()
+ .forResource("Organization")
+ .where(Organization.NAME.matches().value("HELLO"))
+ .count(5)
+ .returnBundle(Bundle.class)
+ .execute();
final String uuid2 = toSearchUuidFromLinkNext(result2);
Search search2 = newTxTemplate().execute(new TransactionCallback() {
@@ -2990,13 +3002,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Thread.sleep(1500);
- Bundle result3 = ourClient
- .search()
- .forResource("Organization")
- .where(Organization.NAME.matches().value("HELLO"))
- .count(5)
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result3 = myClient
+ .search()
+ .forResource("Organization")
+ .where(Organization.NAME.matches().value("HELLO"))
+ .count(5)
+ .returnBundle(Bundle.class)
+ .execute();
String uuid3 = toSearchUuidFromLinkNext(result3);
@@ -3012,15 +3024,15 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
org.setName("HELLO");
resources.add(org);
}
- ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
+ myClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
myDaoConfig.setReuseCachedSearchResultsForMillis(100000L);
- Bundle result1 = ourClient
- .search()
- .forResource("Organization")
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result1 = myClient
+ .search()
+ .forResource("Organization")
+ .returnBundle(Bundle.class)
+ .execute();
final String uuid1 = toSearchUuidFromLinkNext(result1);
Search search1 = newTxTemplate().execute(new TransactionCallback() {
@@ -3031,11 +3043,11 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
});
Date lastReturned1 = search1.getSearchLastReturned();
- Bundle result2 = ourClient
- .search()
- .forResource("Organization")
- .returnBundle(Bundle.class)
- .execute();
+ Bundle result2 = myClient
+ .search()
+ .forResource("Organization")
+ .returnBundle(Bundle.class)
+ .execute();
final String uuid2 = toSearchUuidFromLinkNext(result2);
Search search2 = newTxTemplate().execute(new TransactionCallback() {
@@ -3059,34 +3071,28 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient patient = new Patient();
patient.addIdentifier().setSystem("urn:system2").setValue("testSearchTokenParam002");
patient.addName().setFamily("Tester").addGiven("testSearchTokenParam2");
- ourClient.create().resource(patient).execute();
+ myClient.create().resource(patient).execute();
- //@formatter:off
- Bundle response = ourClient
- .search()
- .forResource(Patient.class)
- .returnBundle(Bundle.class)
- .execute();
- //@formatter:on
+ Bundle response = myClient
+ .search()
+ .forResource(Patient.class)
+ .returnBundle(Bundle.class)
+ .execute();
patient = (Patient) response.getEntry().get(0).getResource();
- //@formatter:off
- ourClient
+ myClient
.meta()
.add()
.onResource(patient.getIdElement())
.meta(new Meta().addTag("http://system", "tag1", "display"))
.execute();
- //@formatter:on
- //@formatter:off
- response = ourClient
- .search()
- .forResource(Patient.class)
- .returnBundle(Bundle.class)
- .execute();
- //@formatter:on
+ response = myClient
+ .search()
+ .forResource(Patient.class)
+ .returnBundle(Bundle.class)
+ .execute();
patient = (Patient) response.getEntry().get(0).getResource();
assertEquals(1, patient.getMeta().getTag().size());
@@ -3098,7 +3104,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
patient.addIdentifier().setSystem("urn:system").setValue("testSearchTokenParam001");
patient.addName().setFamily("Tester").addGiven("testSearchTokenParam1");
patient.addCommunication().getLanguage().setText("testSearchTokenParamComText").addCoding().setCode("testSearchTokenParamCode").setSystem("testSearchTokenParamSystem")
- .setDisplay("testSearchTokenParamDisplay");
+ .setDisplay("testSearchTokenParamDisplay");
myPatientDao.create(patient, mySrd);
patient = new Patient();
@@ -3111,25 +3117,116 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
patient.addName().setFamily("Tester").addGiven("testSearchTokenParam2");
myPatientDao.create(patient, mySrd);
- //@formatter:off
- Bundle response = ourClient
- .search()
- .forResource(Patient.class)
- .where(Patient.IDENTIFIER.hasSystemWithAnyCode("urn:system"))
- .returnBundle(Bundle.class)
- .execute();
- //@formatter:on
+ Bundle response = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(Patient.IDENTIFIER.hasSystemWithAnyCode("urn:system"))
+ .returnBundle(Bundle.class)
+ .execute();
assertEquals(2, response.getEntry().size());
}
+ @Test
+ public void testSearchWithCountNotSet() throws Exception {
+ mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
+ mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(200);
+
+ for (int i = 0; i < 10; i++) {
+ Patient pat = new Patient();
+ pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("test" + i);
+ myClient.create().resource(pat).execute();
+ }
+
+ StopWatch sw = new StopWatch();
+
+ ourLog.info("** About to search with count of 1");
+
+ Bundle found = myClient
+ .search()
+ .forResource(Patient.class)
+ .returnBundle(Bundle.class)
+ .count(1)
+ .execute();
+
+ ourLog.info("** Done searching with count of 1");
+
+ ourLog.info(myCapturingInterceptor.getLastResponse().getAllHeaders().toString());
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE), Matchers.empty());
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE.toLowerCase()),Matchers.empty());
+
+ // If this fails under load, try increasing the throttle above
+ assertEquals(null, found.getTotalElement().getValue());
+ assertEquals(1, found.getEntry().size());
+ assertThat(sw.getMillis(), lessThan(1000L));
+
+ }
+
+ @Test
+ public void testSearchWithCountSearchResultsUpTo20() throws Exception {
+ mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
+ mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(200);
+ myDaoConfig.setCountSearchResultsUpTo(20);
+
+ for (int i = 0; i < 10; i++) {
+ Patient pat = new Patient();
+ pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("test" + i);
+ myClient.create().resource(pat).execute();
+ }
+
+ StopWatch sw = new StopWatch();
+
+ Bundle found = myClient
+ .search()
+ .forResource(Patient.class)
+ .returnBundle(Bundle.class)
+ .count(1)
+ .execute();
+
+ assertThat(sw.getMillis(), not(lessThan(1000L)));
+
+ // If this fails under load, try increasing the throttle above
+ assertEquals(10, found.getTotalElement().getValue().intValue());
+ assertEquals(1, found.getEntry().size());
+ }
+
+ @Test
+ public void testSearchWithCountSearchResultsUpTo5() throws Exception {
+ mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
+ mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(200);
+ myDaoConfig.setCountSearchResultsUpTo(5);
+
+ for (int i = 0; i < 10; i++) {
+ Patient pat = new Patient();
+ pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("test" + i);
+ myClient.create().resource(pat).execute();
+ }
+
+ StopWatch sw = new StopWatch();
+
+ Bundle found = myClient
+ .search()
+ .forResource(Patient.class)
+ .returnBundle(Bundle.class)
+ .count(1)
+ .execute();
+
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE), Matchers.empty());
+ assertThat(myCapturingInterceptor.getLastResponse().getHeaders(Constants.HEADER_X_CACHE.toLowerCase()),Matchers.empty());
+
+ // If this fails under load, try increasing the throttle above
+ assertEquals(null, found.getTotalElement().getValue());
+ assertEquals(1, found.getEntry().size());
+ assertThat(sw.getMillis(), lessThan(1000L));
+ }
+
@Test
public void testSearchWithEmptyParameter() throws Exception {
- Observation obs= new Observation();
+ Observation obs = new Observation();
obs.setStatus(ObservationStatus.FINAL);
obs.getCode().addCoding().setSystem("foo").setCode("bar");
- ourClient.create().resource(obs).execute();
-
+ myClient.create().resource(obs).execute();
+
testSearchWithEmptyParameter("/Observation?value-quantity=");
testSearchWithEmptyParameter("/Observation?code=bar&value-quantity=");
testSearchWithEmptyParameter("/Observation?value-date=");
@@ -3155,23 +3252,21 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void testSearchWithInclude() throws Exception {
Organization org = new Organization();
org.addIdentifier().setSystem("urn:system:rpdstu2").setValue("testSearchWithInclude01");
- IdType orgId = (IdType) ourClient.create().resource(org).prettyPrint().encodedXml().execute().getId();
+ IdType orgId = (IdType) myClient.create().resource(org).prettyPrint().encodedXml().execute().getId();
Patient pat = new Patient();
pat.addIdentifier().setSystem("urn:system:rpdstu2").setValue("testSearchWithInclude02");
pat.getManagingOrganization().setReferenceElement(orgId.toUnqualifiedVersionless());
- ourClient.create().resource(pat).prettyPrint().encodedXml().execute().getId();
+ myClient.create().resource(pat).prettyPrint().encodedXml().execute().getId();
- //@formatter:off
- Bundle found = ourClient
- .search()
- .forResource(Patient.class)
- .where(Patient.IDENTIFIER.exactly().systemAndIdentifier("urn:system:rpdstu2","testSearchWithInclude02"))
- .include(Patient.INCLUDE_ORGANIZATION)
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
- //@formatter:on
+ Bundle found = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(Patient.IDENTIFIER.exactly().systemAndIdentifier("urn:system:rpdstu2", "testSearchWithInclude02"))
+ .include(Patient.INCLUDE_ORGANIZATION)
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
assertEquals(2, found.getEntry().size());
assertEquals(Patient.class, found.getEntry().get(0).getResource().getClass());
@@ -3184,13 +3279,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
public void testSearchWithInvalidNumberPrefix() throws Exception {
try {
//@formatter:off
- ourClient
- .search()
- .forResource(Encounter.class)
- .where(Encounter.LENGTH.withPrefix(ParamPrefixEnum.ENDS_BEFORE).number(100))
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
+ myClient
+ .search()
+ .forResource(Encounter.class)
+ .where(Encounter.LENGTH.withPrefix(ParamPrefixEnum.ENDS_BEFORE).number(100))
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
fail();
} catch (InvalidRequestException e) {
@@ -3205,13 +3300,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
myObservationDao.create(o, mySrd);
try {
//@formatter:off
- ourClient
- .search()
- .forResource(Observation.class)
- .where(Observation.VALUE_QUANTITY.withPrefix(ParamPrefixEnum.ENDS_BEFORE).number(100).andNoUnits())
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
+ myClient
+ .search()
+ .forResource(Observation.class)
+ .where(Observation.VALUE_QUANTITY.withPrefix(ParamPrefixEnum.ENDS_BEFORE).number(100).andNoUnits())
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
fail();
} catch (InvalidRequestException e) {
@@ -3225,13 +3320,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
o.getCode().setText("testSearchWithInvalidSort");
myObservationDao.create(o, mySrd);
//@formatter:off
- ourClient
- .search()
- .forResource(Observation.class)
- .sort().ascending(Observation.CODE_VALUE_QUANTITY) // composite sort not supported yet
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
+ myClient
+ .search()
+ .forResource(Observation.class)
+ .sort().ascending(Observation.CODE_VALUE_QUANTITY) // composite sort not supported yet
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
}
@@ -3242,13 +3337,13 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
String methodName = "testSearchWithMissing";
Organization org = new Organization();
- IIdType deletedIdMissingTrue = ourClient.create().resource(org).execute().getId().toUnqualifiedVersionless();
- ourClient.delete().resourceById(deletedIdMissingTrue).execute();
+ IIdType deletedIdMissingTrue = myClient.create().resource(org).execute().getId().toUnqualifiedVersionless();
+ myClient.delete().resourceById(deletedIdMissingTrue).execute();
org = new Organization();
org.setName("Help I'm a Bug");
- IIdType deletedIdMissingFalse = ourClient.create().resource(org).execute().getId().toUnqualifiedVersionless();
- ourClient.delete().resourceById(deletedIdMissingFalse).execute();
+ IIdType deletedIdMissingFalse = myClient.create().resource(org).execute().getId().toUnqualifiedVersionless();
+ myClient.delete().resourceById(deletedIdMissingFalse).execute();
List resources = new ArrayList();
for (int i = 0; i < 20; i++) {
@@ -3256,27 +3351,27 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
org.setName(methodName + "_0" + i);
resources.add(org);
}
- ourClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
+ myClient.transaction().withResources(resources).prettyPrint().encodedXml().execute();
org = new Organization();
org.addIdentifier().setSystem("urn:system:rpdstu2").setValue(methodName + "01");
org.setName(methodName + "name");
- IIdType orgNotMissing = ourClient.create().resource(org).prettyPrint().encodedXml().execute().getId().toUnqualifiedVersionless();
+ IIdType orgNotMissing = myClient.create().resource(org).prettyPrint().encodedXml().execute().getId().toUnqualifiedVersionless();
org = new Organization();
org.addIdentifier().setSystem("urn:system:rpdstu2").setValue(methodName + "01");
- IIdType orgMissing = ourClient.create().resource(org).prettyPrint().encodedXml().execute().getId().toUnqualifiedVersionless();
+ IIdType orgMissing = myClient.create().resource(org).prettyPrint().encodedXml().execute().getId().toUnqualifiedVersionless();
{
//@formatter:off
- Bundle found = ourClient
- .search()
- .forResource(Organization.class)
- .where(Organization.NAME.isMissing(false))
- .count(100)
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
+ Bundle found = myClient
+ .search()
+ .forResource(Organization.class)
+ .where(Organization.NAME.isMissing(false))
+ .count(100)
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
List list = toUnqualifiedVersionlessIds(found);
@@ -3288,15 +3383,15 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
//@formatter:off
- Bundle found = ourClient
- .search()
- .forResource(Organization.class)
- .where(Organization.NAME.isMissing(true))
- .count(100)
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
- //@formatter:on
+ Bundle found = myClient
+ .search()
+ .forResource(Organization.class)
+ .where(Organization.NAME.isMissing(true))
+ .count(100)
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
+ //@formatter:on
List list = toUnqualifiedVersionlessIds(found);
ourLog.info(methodName + " found: " + list.toString() + " - Wanted " + orgMissing + " but not " + orgNotMissing);
@@ -3342,7 +3437,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
/**
* See #411
- *
+ *
* Let's see if we can reproduce this issue in JPA
*/
@Test
@@ -3376,7 +3471,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Observation obs = new Observation();
obs.getCode().setText("THIS_IS_THE_TEXT");
obs.getCode().addCoding().setSystem("SYSTEM").setCode("CODE").setDisplay("THIS_IS_THE_DISPLAY");
- ourClient.create().resource(obs).execute();
+ myClient.create().resource(obs).execute();
testSearchReturnsResults("/Observation?code%3Atext=THIS_IS_THE_TEXT");
testSearchReturnsResults("/Observation?code%3Atext=THIS_IS_THE_");
@@ -3395,119 +3490,119 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Daniel").setFamily("Adams");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Aaron").setFamily("Alexis");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Carol").setFamily("Allen");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Ruth").setFamily("Black");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Brian").setFamily("Brooks");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Susan").setFamily("Clark");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Amy").setFamily("Clark");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Anthony").setFamily("Coleman");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Steven").setFamily("Coleman");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Lisa").setFamily("Coleman");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Ruth").setFamily("Cook");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Betty").setFamily("Davis");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Joshua").setFamily("Diaz");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Brian").setFamily("Gracia");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Stephan").setFamily("Graham");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
p = new Patient();
p.addIdentifier().setSystem("urn:system").setValue(methodName);
p.addName().addGiven("Sarah").setFamily("Graham");
- ourClient.create().resource(p).execute();
+ myClient.create().resource(p).execute();
- Bundle resp = ourClient
- .search()
- .forResource(Patient.class)
- .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system", methodName))
- .sort().ascending(Patient.FAMILY)
- .sort().ascending(Patient.GIVEN)
- .count(100)
- .returnBundle(Bundle.class)
- .execute();
+ Bundle resp = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system", methodName))
+ .sort().ascending(Patient.FAMILY)
+ .sort().ascending(Patient.GIVEN)
+ .count(100)
+ .returnBundle(Bundle.class)
+ .execute();
List names = toNameList(resp);
ourLog.info(StringUtils.join(names, '\n'));
assertThat(names, contains( // this matches in order only
- "Daniel Adams",
- "Aaron Alexis",
- "Carol Allen",
- "Ruth Black",
- "Brian Brooks",
- "Amy Clark",
- "Susan Clark",
- "Anthony Coleman",
- "Lisa Coleman",
- "Steven Coleman",
- "Ruth Cook",
- "Betty Davis",
- "Joshua Diaz",
- "Brian Gracia",
- "Sarah Graham",
- "Stephan Graham"));
+ "Daniel Adams",
+ "Aaron Alexis",
+ "Carol Allen",
+ "Ruth Black",
+ "Brian Brooks",
+ "Amy Clark",
+ "Susan Clark",
+ "Anthony Coleman",
+ "Lisa Coleman",
+ "Steven Coleman",
+ "Ruth Cook",
+ "Betty Davis",
+ "Joshua Diaz",
+ "Brian Gracia",
+ "Sarah Graham",
+ "Stephan Graham"));
}
@@ -3519,7 +3614,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Organization org = new Organization();
org.setName("測試醫院");
org.addIdentifier().setSystem("urn:system").setValue("testStoreUtf8Characters_01");
- IdType orgId = (IdType) ourClient.create().resource(org).prettyPrint().encodedXml().execute().getId();
+ IdType orgId = (IdType) myClient.create().resource(org).prettyPrint().encodedXml().execute().getId();
// Read back directly from the DAO
{
@@ -3530,7 +3625,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
}
// Read back through the HTTP API
{
- Organization returned = ourClient.read(Organization.class, orgId.getIdPart());
+ Organization returned = myClient.read(Organization.class, orgId.getIdPart());
String val = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(returned);
ourLog.info(val);
assertThat(val, containsString(""));
@@ -3560,7 +3655,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
p1.setManagingOrganization(new Reference("Organization/99999999999"));
try {
- ourClient.create().resource(p1).execute().getId();
+ myClient.create().resource(p1).execute().getId();
fail();
} catch (InvalidRequestException e) {
assertThat(e.getMessage(), containsString("Organization/99999999999"));
@@ -3585,7 +3680,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(400, response.getStatusLine().getStatusCode());
OperationOutcome oo = myFhirCtx.newXmlParser().parseResource(OperationOutcome.class, responseString);
assertThat(oo.getIssue().get(0).getDiagnostics(),
- containsString("Can not update resource, request URL must contain an ID element for update (PUT) operation (it must be of the form [base]/[resource type]/[id])"));
+ containsString("Can not update resource, request URL must contain an ID element for update (PUT) operation (it must be of the form [base]/[resource type]/[id])"));
} finally {
response.close();
}
@@ -3646,7 +3741,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient p1 = new Patient();
p1.addIdentifier().setSystem("urn:system").setValue("testUpdateRejectsInvalidTypes");
p1.addName().setFamily("Tester").addGiven("testUpdateRejectsInvalidTypes");
- IdType p1id = (IdType) ourClient.create().resource(p1).execute().getId();
+ IdType p1id = (IdType) myClient.create().resource(p1).execute().getId();
// Try to update with the wrong ID in the resource body
p1.setId("FOO");
@@ -3663,9 +3758,9 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(400, response.getStatusLine().getStatusCode());
OperationOutcome oo = myFhirCtx.newJsonParser().parseResource(OperationOutcome.class, new InputStreamReader(response.getEntity().getContent()));
assertEquals(
- "Can not update resource, resource body must contain an ID element which matches the request URL for update (PUT) operation - Resource body ID of \"FOO\" does not match URL ID of \""
- + p1id.getIdPart() + "\"",
- oo.getIssue().get(0).getDiagnostics());
+ "Can not update resource, resource body must contain an ID element which matches the request URL for update (PUT) operation - Resource body ID of \"FOO\" does not match URL ID of \""
+ + p1id.getIdPart() + "\"",
+ oo.getIssue().get(0).getDiagnostics());
} finally {
response.close();
}
@@ -3707,20 +3802,20 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient p1 = new Patient();
p1.addIdentifier().setSystem("urn:system").setValue("testUpdateRejectsInvalidTypes");
p1.addName().setFamily("Tester").addGiven("testUpdateRejectsInvalidTypes");
- IdType p1id = (IdType) ourClient.create().resource(p1).execute().getId();
+ IdType p1id = (IdType) myClient.create().resource(p1).execute().getId();
Organization p2 = new Organization();
p2.setId(p1id.getIdPart());
p2.getNameElement().setValue("testUpdateRejectsInvalidTypes");
try {
- ourClient.update().resource(p2).withId("Organization/" + p1id.getIdPart()).execute();
+ myClient.update().resource(p2).withId("Organization/" + p1id.getIdPart()).execute();
fail();
} catch (UnprocessableEntityException e) {
// good
}
try {
- ourClient.update().resource(p2).withId("Patient/" + p1id.getIdPart()).execute();
+ myClient.update().resource(p2).withId("Patient/" + p1id.getIdPart()).execute();
fail();
} catch (UnprocessableEntityException e) {
// good
@@ -3896,21 +3991,21 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient p1 = new Patient();
p1.addIdentifier().setSystem("urn:system").setValue("testUpdateWithClientSuppliedIdWhichDoesntExistRpDstu2");
- MethodOutcome outcome = ourClient.update().resource(p1).withId("testUpdateWithClientSuppliedIdWhichDoesntExistRpDstu2").execute();
+ MethodOutcome outcome = myClient.update().resource(p1).withId("testUpdateWithClientSuppliedIdWhichDoesntExistRpDstu2").execute();
assertEquals(true, outcome.getCreated().booleanValue());
IdType p1Id = (IdType) outcome.getId();
assertThat(p1Id.getValue(), containsString("Patient/testUpdateWithClientSuppliedIdWhichDoesntExistRpDstu2/_history"));
//@formatter:off
- Bundle actual = ourClient
- .search()
- .forResource(Patient.class)
- .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system", "testUpdateWithClientSuppliedIdWhichDoesntExistRpDstu2"))
- .encodedJson()
- .prettyPrint()
- .returnBundle(Bundle.class)
- .execute();
+ Bundle actual = myClient
+ .search()
+ .forResource(Patient.class)
+ .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:system", "testUpdateWithClientSuppliedIdWhichDoesntExistRpDstu2"))
+ .encodedJson()
+ .prettyPrint()
+ .returnBundle(Bundle.class)
+ .execute();
//@formatter:on
assertEquals(1, actual.getEntry().size());
@@ -3924,7 +4019,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
Patient pt = new Patient();
pt.addName().setFamily(methodName);
- IIdType id = ourClient.create().resource(pt).execute().getId().toUnqualifiedVersionless();
+ IIdType id = myClient.create().resource(pt).execute().getId().toUnqualifiedVersionless();
pt.addName().setFamily("FAM2");
pt.setId(id.toUnqualifiedVersionless());
@@ -3977,13 +4072,27 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(400, response.getStatusLine().getStatusCode());
OperationOutcome oo = myFhirCtx.newXmlParser().parseResource(OperationOutcome.class, responseString);
assertEquals(
- "Can not update resource, resource body must contain an ID element which matches the request URL for update (PUT) operation - Resource body ID of \"333\" does not match URL ID of \"A2\"",
- oo.getIssue().get(0).getDiagnostics());
+ "Can not update resource, resource body must contain an ID element which matches the request URL for update (PUT) operation - Resource body ID of \"333\" does not match URL ID of \"A2\"",
+ oo.getIssue().get(0).getDiagnostics());
} finally {
response.close();
}
}
+ @Test
+ public void testUpdateWrongResourceType() throws IOException {
+ String input = IOUtils.toString(getClass().getResourceAsStream("/dstu3-person.json"), StandardCharsets.UTF_8);
+
+ try {
+ MethodOutcome resp = myClient.update().resource(input).withId("Patient/PERSON1").execute();
+ } catch (InvalidRequestException e) {
+ assertEquals("", e.getMessage());
+ }
+
+ MethodOutcome resp = myClient.update().resource(input).withId("Person/PERSON1").execute();
+ assertEquals("Person/PERSON1/_history/1", resp.getId().toUnqualified().getValue());
+ }
+
@Test
public void testValidateBadInputViaGet() throws IOException {
@@ -4043,7 +4152,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(412, response.getStatusLine().getStatusCode());
assertThat(resp, not(containsString("Resource has no id")));
assertThat(resp,
- stringContainsInOrder(">ERROR<", "[Patient.contact]", "SHALL at least contain a contact's details or a reference to an organization", ""));
+ stringContainsInOrder(">ERROR<", "[Patient.contact]", "SHALL at least contain a contact's details or a reference to an organization", ""));
} finally {
IOUtils.closeQuietly(response.getEntity().getContent());
response.close();
@@ -4155,8 +4264,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertThat(resp, not(containsString("Resource has no id")));
assertThat(resp, containsString("No issues detected during validation
"));
assertThat(resp,
- stringContainsInOrder("", "", "", " "));
+ stringContainsInOrder("", "", "", " "));
} finally {
IOUtils.closeQuietly(response.getEntity().getContent());
response.close();
@@ -4182,8 +4291,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertThat(resp, not(containsString("Resource has no id")));
assertThat(resp, containsString("No issues detected during validation
"));
assertThat(resp,
- stringContainsInOrder("", "", "", " "));
+ stringContainsInOrder("", "", "", " "));
} finally {
IOUtils.closeQuietly(response.getEntity().getContent());
response.close();
@@ -4193,10 +4302,10 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
@Test
public void testValueSetExpandOperation() throws IOException {
CodeSystem cs = myFhirCtx.newXmlParser().parseResource(CodeSystem.class, new InputStreamReader(ResourceProviderR4Test.class.getResourceAsStream("/extensional-case-3-cs.xml")));
- ourClient.create().resource(cs).execute();
+ myClient.create().resource(cs).execute();
ValueSet upload = myFhirCtx.newXmlParser().parseResource(ValueSet.class, new InputStreamReader(ResourceProviderR4Test.class.getResourceAsStream("/extensional-case-3-vs.xml")));
- IIdType vsid = ourClient.create().resource(upload).execute().getId().toUnqualifiedVersionless();
+ IIdType vsid = myClient.create().resource(upload).execute().getId().toUnqualifiedVersionless();
HttpGet get = new HttpGet(ourServerBase + "/ValueSet/" + vsid.getIdPart() + "/$expand");
CloseableHttpResponse response = ourHttpClient.execute(get);
@@ -4234,8 +4343,8 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
assertEquals(200, response.getStatusLine().getStatusCode());
//@formatter:off
assertThat(resp, stringContainsInOrder(
- "",
- "",
+ " codeSystemDao = myCodeSystemDao;
IResourceTableDao resourceTableDao = myResourceTableDao;
IHapiTerminologySvc termSvc = myTermSvc;
-
+
return createExternalCs(codeSystemDao, resourceTableDao, termSvc, mySrd);
}
- public static CodeSystem createExternalCs(IFhirResourceDao theCodeSystemDao, IResourceTableDao theResourceTableDao, IHapiTerminologySvc theTermSvc, ServletRequestDetails theRequestDetails) {
- CodeSystem codeSystem = new CodeSystem();
- codeSystem.setUrl(URL_MY_CODE_SYSTEM);
- codeSystem.setContent(CodeSystemContentMode.NOTPRESENT);
- IIdType id = theCodeSystemDao.create(codeSystem, theRequestDetails).getId().toUnqualified();
-
- ResourceTable table = theResourceTableDao.findOne(id.getIdPartAsLong());
-
- TermCodeSystemVersion cs = new TermCodeSystemVersion();
- cs.setResource(table);
- cs.setResourceVersionId(table.getVersion());
-
- TermConcept parentA = new TermConcept(cs, "ParentA").setDisplay("Parent A");
- cs.getConcepts().add(parentA);
-
- TermConcept childAA = new TermConcept(cs, "childAA").setDisplay("Child AA");
- parentA.addChild(childAA, RelationshipTypeEnum.ISA);
-
- TermConcept childAAA = new TermConcept(cs, "childAAA").setDisplay("Child AAA");
- childAA.addChild(childAAA, RelationshipTypeEnum.ISA);
-
- TermConcept childAAB = new TermConcept(cs, "childAAB").setDisplay("Child AAB");
- childAA.addChild(childAAB, RelationshipTypeEnum.ISA);
-
- TermConcept childAB = new TermConcept(cs, "childAB").setDisplay("Child AB");
- parentA.addChild(childAB, RelationshipTypeEnum.ISA);
-
- TermConcept parentB = new TermConcept(cs, "ParentB").setDisplay("Parent B");
- cs.getConcepts().add(parentB);
-
- theTermSvc.storeNewCodeSystemVersion(table.getId(), URL_MY_CODE_SYSTEM, cs);
- return codeSystem;
- }
-
private void createExternalCsAndLocalVs() {
CodeSystem codeSystem = createExternalCs();
@@ -131,17 +75,17 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
//@formatter:off
CodeSystem codeSystem = new CodeSystem();
codeSystem.setUrl(URL_MY_CODE_SYSTEM);
- codeSystem.setContent(CodeSystemContentMode.COMPLETE);
+ codeSystem.setContent(CodeSystemContentMode.COMPLETE);
codeSystem
.addConcept().setCode("A").setDisplay("Code A")
- .addConcept(new ConceptDefinitionComponent().setCode("AA").setDisplay("Code AA")
- .addConcept(new ConceptDefinitionComponent().setCode("AAA").setDisplay("Code AAA"))
- )
- .addConcept(new ConceptDefinitionComponent().setCode("AB").setDisplay("Code AB"));
+ .addConcept(new ConceptDefinitionComponent().setCode("AA").setDisplay("Code AA")
+ .addConcept(new ConceptDefinitionComponent().setCode("AAA").setDisplay("Code AAA"))
+ )
+ .addConcept(new ConceptDefinitionComponent().setCode("AB").setDisplay("Code AB"));
codeSystem
.addConcept().setCode("B").setDisplay("Code B")
- .addConcept(new ConceptDefinitionComponent().setCode("BA").setDisplay("Code BA"))
- .addConcept(new ConceptDefinitionComponent().setCode("BB").setDisplay("Code BB"));
+ .addConcept(new ConceptDefinitionComponent().setCode("BA").setDisplay("Code BA"))
+ .addConcept(new ConceptDefinitionComponent().setCode("BB").setDisplay("Code BB"));
//@formatter:on
myCodeSystemDao.create(codeSystem, mySrd);
@@ -177,7 +121,7 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
@Test
public void testExpandById() throws IOException {
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onInstance(myExtensionalVsId)
.named("expand")
@@ -185,54 +129,30 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
//@formatter:on
-
+
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
- assertThat(resp, containsString(""));
+ assertThat(resp, containsString(""));
assertThat(resp, containsString(""));
assertThat(resp, containsString(""));
assertThat(resp, containsString(""));
assertThat(resp, containsString(""));
- assertThat(resp, containsString(" "));
assertThat(resp, containsString(""));
assertThat(resp, containsString(""));
assertThat(resp, containsString(""));
- assertThat(resp, containsString(" "));
assertThat(resp, containsString(" "));
}
- @Test
- public void testExpandByIdentifier() {
- //@formatter:off
- Parameters respParam = ourClient
- .operation()
- .onType(ValueSet.class)
- .named("expand")
- .withParameter(Parameters.class, "identifier", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
- .execute();
- ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
- //@formatter:on
-
- String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
- ourLog.info(resp);
- //@formatter:off
- assertThat(resp, stringContainsInOrder(
- "",
- "",
+ "",
- "",
+ ""));
}
@@ -294,9 +233,9 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
createExternalCsAndLocalVs();
assertNotNull(myLocalVs);
myLocalVs.setId("");
-
+
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onType(ValueSet.class)
.named("expand")
@@ -304,22 +243,21 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
//@formatter:on
-
+
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
-
+
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, not(containsStringIgnoringCase("")));
-
- }
+ }
@Test
public void testExpandInvalidParams() throws IOException {
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onType(ValueSet.class)
.named("expand")
@@ -327,39 +265,39 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
.execute();
fail();
} catch (InvalidRequestException e) {
- assertEquals("HTTP 400 Bad Request: $expand operation at the type level (no ID specified) requires an identifier or a valueSet as a part of the request", e.getMessage());
+ assertEquals("HTTP 400 Bad Request: $expand operation at the type level (no ID specified) requires a url or a valueSet as a part of the request", e.getMessage());
}
//@formatter:on
//@formatter:off
try {
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/r4/extensional-case-r4.xml");
- ourClient
+ myClient
.operation()
.onType(ValueSet.class)
.named("expand")
.withParameter(Parameters.class, "valueSet", toExpand)
- .andParameter("identifier", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
+ .andParameter("url", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
.execute();
fail();
} catch (InvalidRequestException e) {
- assertEquals("HTTP 400 Bad Request: $expand must EITHER be invoked at the instance level, or have an identifier specified, or have a ValueSet specified. Can not combine these options.", e.getMessage());
+ assertEquals("HTTP 400 Bad Request: $expand must EITHER be invoked at the instance level, or have a url specified, or have a ValueSet specified. Can not combine these options.", e.getMessage());
}
//@formatter:on
//@formatter:off
try {
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/r4/extensional-case.xml");
- ourClient
+ myClient
.operation()
.onInstance(myExtensionalVsId)
.named("expand")
.withParameter(Parameters.class, "valueSet", toExpand)
- .andParameter("identifier", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
+ .andParameter("url", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
.execute();
fail();
} catch (InvalidRequestException e) {
- assertEquals("HTTP 400 Bad Request: $expand must EITHER be invoked at the instance level, or have an identifier specified, or have a ValueSet specified. Can not combine these options.", e.getMessage());
+ assertEquals("HTTP 400 Bad Request: $expand must EITHER be invoked at the instance level, or have a url specified, or have a ValueSet specified. Can not combine these options.", e.getMessage());
}
//@formatter:on
@@ -369,9 +307,9 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
public void testExpandLocalVsAgainstBuiltInCs() throws IOException {
createLocalVsPointingAtBuiltInCodeSystem();
assertNotNull(myLocalValueSetId);
-
+
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onInstance(myLocalValueSetId)
.named("expand")
@@ -379,24 +317,20 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
//@formatter:on
-
+
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
-
+
assertThat(resp, containsStringIgnoringCase(""));
}
-
-
-
-
-
+
@Test
public void testExpandLocalVsAgainstExternalCs() throws IOException {
createExternalCsAndLocalVs();
assertNotNull(myLocalValueSetId);
-
+
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onInstance(myLocalValueSetId)
.named("expand")
@@ -404,48 +338,48 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
//@formatter:on
-
+
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
-
+
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, not(containsStringIgnoringCase("")));
-
+
}
@Test
public void testExpandLocalVsCanonicalAgainstExternalCs() throws IOException {
createExternalCsAndLocalVs();
assertNotNull(myLocalValueSetId);
-
+
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onType(ValueSet.class)
.named("expand")
- .withParameter(Parameters.class, "identifier", new UriType(URL_MY_VALUE_SET))
+ .withParameter(Parameters.class, "url", new UriType(URL_MY_VALUE_SET))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
//@formatter:on
-
+
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
-
+
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, containsStringIgnoringCase(""));
assertThat(resp, not(containsStringIgnoringCase("")));
-
+
}
@Test
public void testExpandLocalVsWithUnknownCode() throws IOException {
createExternalCsAndLocalVsWithUnknownCode();
assertNotNull(myLocalValueSetId);
-
+
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onInstance(myLocalValueSetId)
.named("expand")
@@ -457,38 +391,35 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
//@formatter:on
}
+ /**
+ * #516
+ */
@Test
- public void testValiedateCodeAgainstBuiltInSystem() {
- //@formatter:off
- Parameters respParam = ourClient
- .operation()
- .onType(ValueSet.class)
- .named("validate-code")
- .withParameter(Parameters.class, "code", new StringType("BRN"))
- .andParameter("identifier", new StringType("http://hl7.org/fhir/ValueSet/v2-0487"))
- .andParameter("system", new StringType("http://hl7.org/fhir/v2/0487"))
- .useHttpGet()
- .execute();
- //@formatter:on
+ public void testInvalidFilter() throws Exception {
+ String string = IOUtils.toString(getClass().getResourceAsStream("/bug_516_invalid_expansion.json"), StandardCharsets.UTF_8);
+ HttpPost post = new HttpPost(ourServerBase + "/ValueSet/%24expand");
+ post.setEntity(new StringEntity(string, ContentType.parse(ca.uhn.fhir.rest.api.Constants.CT_FHIR_JSON_NEW)));
- String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
- ourLog.info(resp);
-
- assertEquals("result", respParam.getParameter().get(0).getName());
- assertEquals(true, ((BooleanType)respParam.getParameter().get(0).getValue()).getValue().booleanValue());
-
- assertEquals("message", respParam.getParameter().get(1).getName());
- assertThat(((StringType)respParam.getParameter().get(1).getValue()).getValue(), containsStringIgnoringCase("succeeded"));
+ CloseableHttpResponse resp = ourHttpClient.execute(post);
+ try {
- assertEquals("display", respParam.getParameter().get(2).getName());
- assertEquals("Burn", ((StringType)respParam.getParameter().get(2).getValue()).getValue());
+ String respString = IOUtils.toString(resp.getEntity().getContent(), StandardCharsets.UTF_8);
+ ourLog.info(respString);
+
+ ourLog.info(resp.toString());
+
+ assertEquals(400, resp.getStatusLine().getStatusCode());
+ assertThat(respString, containsString("Unknown FilterOperator code 'n'"));
+
+ } finally {
+ IOUtils.closeQuietly(resp);
+ }
}
-
@Test
public void testValidateCodeOperationByCodeAndSystemInstance() {
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onInstance(myExtensionalVsId)
.named("validate-code")
@@ -499,14 +430,14 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
ourLog.info(resp);
-
- assertEquals(true, ((BooleanType)respParam.getParameter().get(0).getValue()).booleanValue());
+
+ assertEquals(true, ((BooleanType) respParam.getParameter().get(0).getValue()).booleanValue());
}
@Test
public void testValidateCodeOperationByCodeAndSystemType() {
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onType(ValueSet.class)
.named("validate-code")
@@ -517,8 +448,33 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
ourLog.info(resp);
-
- assertEquals(true, ((BooleanType)respParam.getParameter().get(0).getValue()).booleanValue());
+
+ assertEquals(true, ((BooleanType) respParam.getParameter().get(0).getValue()).booleanValue());
+ }
+
+ @Test
+ public void testValiedateCodeAgainstBuiltInSystem() {
+ Parameters respParam = myClient
+ .operation()
+ .onType(ValueSet.class)
+ .named("validate-code")
+ .withParameter(Parameters.class, "code", new StringType("BRN"))
+ .andParameter("url", new StringType("http://hl7.org/fhir/ValueSet/v2-0487"))
+ .andParameter("system", new StringType("http://hl7.org/fhir/v2/0487"))
+ .useHttpGet()
+ .execute();
+
+ String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
+ ourLog.info(resp);
+
+ assertEquals("result", respParam.getParameter().get(0).getName());
+ assertEquals(true, ((BooleanType) respParam.getParameter().get(0).getValue()).getValue().booleanValue());
+
+ assertEquals("message", respParam.getParameter().get(1).getName());
+ assertThat(((StringType) respParam.getParameter().get(1).getValue()).getValue(), containsStringIgnoringCase("succeeded"));
+
+ assertEquals("display", respParam.getParameter().get(2).getName());
+ assertEquals("Burn", ((StringType) respParam.getParameter().get(2).getValue()).getValue());
}
@AfterClass
@@ -526,4 +482,38 @@ public class ResourceProviderR4ValueSetTest extends BaseResourceProviderR4Test {
TestUtil.clearAllStaticFieldsForUnitTest();
}
+ public static CodeSystem createExternalCs(IFhirResourceDao theCodeSystemDao, IResourceTableDao theResourceTableDao, IHapiTerminologySvc theTermSvc, ServletRequestDetails theRequestDetails) {
+ CodeSystem codeSystem = new CodeSystem();
+ codeSystem.setUrl(URL_MY_CODE_SYSTEM);
+ codeSystem.setContent(CodeSystemContentMode.NOTPRESENT);
+ IIdType id = theCodeSystemDao.create(codeSystem, theRequestDetails).getId().toUnqualified();
+
+ ResourceTable table = theResourceTableDao.findOne(id.getIdPartAsLong());
+
+ TermCodeSystemVersion cs = new TermCodeSystemVersion();
+ cs.setResource(table);
+ cs.setResourceVersionId(table.getVersion());
+
+ TermConcept parentA = new TermConcept(cs, "ParentA").setDisplay("Parent A");
+ cs.getConcepts().add(parentA);
+
+ TermConcept childAA = new TermConcept(cs, "childAA").setDisplay("Child AA");
+ parentA.addChild(childAA, RelationshipTypeEnum.ISA);
+
+ TermConcept childAAA = new TermConcept(cs, "childAAA").setDisplay("Child AAA");
+ childAA.addChild(childAAA, RelationshipTypeEnum.ISA);
+
+ TermConcept childAAB = new TermConcept(cs, "childAAB").setDisplay("Child AAB");
+ childAA.addChild(childAAB, RelationshipTypeEnum.ISA);
+
+ TermConcept childAB = new TermConcept(cs, "childAB").setDisplay("Child AB");
+ parentA.addChild(childAB, RelationshipTypeEnum.ISA);
+
+ TermConcept parentB = new TermConcept(cs, "ParentB").setDisplay("Parent B");
+ cs.getConcepts().add(parentB);
+
+ theTermSvc.storeNewCodeSystemVersion(table.getId(), URL_MY_CODE_SYSTEM, cs);
+ return codeSystem;
+ }
+
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/StaleSearchDeletingSvcR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/StaleSearchDeletingSvcR4Test.java
index 8334a1d3bd8..998e8250a57 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/StaleSearchDeletingSvcR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/StaleSearchDeletingSvcR4Test.java
@@ -56,7 +56,7 @@ public class StaleSearchDeletingSvcR4Test extends BaseResourceProviderR4Test {
}
//@formatter:off
- IClientExecutable, Bundle> search = ourClient
+ IClientExecutable, Bundle> search = myClient
.search()
.forResource(Patient.class)
.where(Patient.NAME.matches().value("Everything"))
@@ -74,12 +74,12 @@ public class StaleSearchDeletingSvcR4Test extends BaseResourceProviderR4Test {
String nextLinkUrl = nextLink.getUrl();
assertThat(nextLinkUrl, not(blankOrNullString()));
- Bundle resp2 = ourClient.search().byUrl(nextLinkUrl).returnBundle(Bundle.class).execute();
+ Bundle resp2 = myClient.search().byUrl(nextLinkUrl).returnBundle(Bundle.class).execute();
ourLog.info(myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(resp2));
myStaleSearchDeletingSvc.pollForStaleSearchesAndDeleteThem();
- ourClient.search().byUrl(nextLinkUrl).returnBundle(Bundle.class).execute();
+ myClient.search().byUrl(nextLinkUrl).returnBundle(Bundle.class).execute();
Thread.sleep(20);
myDaoConfig.setExpireSearchResultsAfterMillis(10);
@@ -87,7 +87,7 @@ public class StaleSearchDeletingSvcR4Test extends BaseResourceProviderR4Test {
myStaleSearchDeletingSvc.pollForStaleSearchesAndDeleteThem();
try {
- ourClient.search().byUrl(nextLinkUrl).returnBundle(Bundle.class).execute();
+ myClient.search().byUrl(nextLinkUrl).returnBundle(Bundle.class).execute();
fail();
} catch (ResourceGoneException e) {
assertThat(e.getMessage(), containsString("does not exist and may have expired"));
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SubscriptionsR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SubscriptionsR4Test.java
index eac3edd6280..8724c3fdffa 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SubscriptionsR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SubscriptionsR4Test.java
@@ -57,7 +57,7 @@ public class SubscriptionsR4Test extends BaseResourceProviderR4Test {
subs.getChannel().setEndpoint("http://localhost:8888");
subs.setCriteria("Observation?identifier=123");
try {
- ourClient.create().resource(subs).execute();
+ myClient.create().resource(subs).execute();
fail();
} catch (UnprocessableEntityException e) {
assertThat(e.getMessage(), containsString("Subscription.status must be populated on this server"));
@@ -65,14 +65,14 @@ public class SubscriptionsR4Test extends BaseResourceProviderR4Test {
subs.setId("ABC");
try {
- ourClient.update().resource(subs).execute();
+ myClient.update().resource(subs).execute();
fail();
} catch (UnprocessableEntityException e) {
assertThat(e.getMessage(), containsString("Subscription.status must be populated on this server"));
}
subs.setStatus(SubscriptionStatus.REQUESTED);
- ourClient.update().resource(subs).execute();
+ myClient.update().resource(subs).execute();
}
@Test
@@ -84,7 +84,7 @@ public class SubscriptionsR4Test extends BaseResourceProviderR4Test {
subs.setStatus(SubscriptionStatus.ACTIVE);
subs.setCriteria("Observation?identifier=123");
try {
- ourClient.create().resource(subs).execute();
+ myClient.create().resource(subs).execute();
fail();
} catch (UnprocessableEntityException e) {
assertEquals("HTTP 422 Unprocessable Entity: Subscription.status must be 'off' or 'requested' on a newly created subscription", e.getMessage());
@@ -92,7 +92,7 @@ public class SubscriptionsR4Test extends BaseResourceProviderR4Test {
subs.setId("ABC");
try {
- ourClient.update().resource(subs).execute();
+ myClient.update().resource(subs).execute();
fail();
} catch (UnprocessableEntityException e) {
assertEquals("HTTP 422 Unprocessable Entity: Subscription.status must be 'off' or 'requested' on a newly created subscription", e.getMessage());
@@ -109,13 +109,13 @@ public class SubscriptionsR4Test extends BaseResourceProviderR4Test {
subs.getChannel().setEndpoint("http://localhost:8888");
subs.setStatus(SubscriptionStatus.REQUESTED);
subs.setCriteria("Observation?identifier=123");
- IIdType id = ourClient.create().resource(subs).execute().getId().toUnqualifiedVersionless();
+ IIdType id = myClient.create().resource(subs).execute().getId().toUnqualifiedVersionless();
subs.setId(id);
try {
subs.setStatus(SubscriptionStatus.ACTIVE);
- ourClient.update().resource(subs).execute();
+ myClient.update().resource(subs).execute();
fail();
} catch (UnprocessableEntityException e) {
assertEquals("HTTP 422 Unprocessable Entity: Subscription.status can not be changed from 'requested' to 'active'", e.getMessage());
@@ -123,7 +123,7 @@ public class SubscriptionsR4Test extends BaseResourceProviderR4Test {
try {
subs.setStatus((SubscriptionStatus) null);
- ourClient.update().resource(subs).execute();
+ myClient.update().resource(subs).execute();
fail();
} catch (UnprocessableEntityException e) {
assertThat(e.getMessage(), containsString("Subscription.status must be populated on this server"));
@@ -141,12 +141,12 @@ public class SubscriptionsR4Test extends BaseResourceProviderR4Test {
subs.getChannel().setEndpoint("http://localhost:8888");
subs.setCriteria("Observation?identifier=123");
subs.setStatus(SubscriptionStatus.REQUESTED);
- IIdType id = ourClient.create().resource(subs).execute().getId();
+ IIdType id = myClient.create().resource(subs).execute().getId();
subs.setId(id);
try {
subs.setStatus(SubscriptionStatus.ACTIVE);
- ourClient.update().resource(subs).execute();
+ myClient.update().resource(subs).execute();
fail();
} catch (UnprocessableEntityException e) {
assertEquals("HTTP 422 Unprocessable Entity: Subscription.status can not be changed from 'requested' to 'active'", e.getMessage());
@@ -154,14 +154,14 @@ public class SubscriptionsR4Test extends BaseResourceProviderR4Test {
try {
subs.setStatus((SubscriptionStatus) null);
- ourClient.update().resource(subs).execute();
+ myClient.update().resource(subs).execute();
fail();
} catch (UnprocessableEntityException e) {
assertThat(e.getMessage(), containsString("Subscription.status must be populated on this server"));
}
subs.setStatus(SubscriptionStatus.OFF);
- ourClient.update().resource(subs).execute();
+ myClient.update().resource(subs).execute();
}
@AfterClass
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/TerminologyUploaderProviderR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/TerminologyUploaderProviderR4Test.java
index 708d05d6ac6..e15dee56274 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/TerminologyUploaderProviderR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/TerminologyUploaderProviderR4Test.java
@@ -43,7 +43,7 @@ public class TerminologyUploaderProviderR4Test extends BaseResourceProviderR4Tes
byte[] packageBytes = createSctZip();
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onServer()
.named("upload-external-code-system")
@@ -63,7 +63,7 @@ public class TerminologyUploaderProviderR4Test extends BaseResourceProviderR4Tes
byte[] packageBytes = createLoincZip();
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onServer()
.named("upload-external-code-system")
@@ -82,7 +82,7 @@ public class TerminologyUploaderProviderR4Test extends BaseResourceProviderR4Tes
*/
//@formatter:off
- respParam = ourClient
+ respParam = myClient
.operation()
.onServer()
.named("upload-external-code-system")
@@ -107,7 +107,7 @@ public class TerminologyUploaderProviderR4Test extends BaseResourceProviderR4Tes
fos.close();
//@formatter:off
- Parameters respParam = ourClient
+ Parameters respParam = myClient
.operation()
.onServer()
.named("upload-external-code-system")
@@ -128,7 +128,7 @@ public class TerminologyUploaderProviderR4Test extends BaseResourceProviderR4Tes
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onServer()
.named("upload-external-code-system")
@@ -148,7 +148,7 @@ public class TerminologyUploaderProviderR4Test extends BaseResourceProviderR4Tes
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onServer()
.named("upload-external-code-system")
@@ -165,7 +165,7 @@ public class TerminologyUploaderProviderR4Test extends BaseResourceProviderR4Tes
public void testUploadMissingPackage() throws Exception {
//@formatter:off
try {
- ourClient
+ myClient
.operation()
.onServer()
.named("upload-external-code-system")
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java
index 2720e48f8f3..9126cec246a 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java
@@ -1,41 +1,60 @@
package ca.uhn.fhir.jpa.search;
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
-
-import java.util.*;
-
-import javax.persistence.EntityManager;
-
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.junit.*;
-import org.junit.runner.RunWith;
-import org.mockito.*;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.mockito.stubbing.Answer;
-import org.springframework.data.domain.*;
-import org.springframework.transaction.PlatformTransactionManager;
-
-import com.google.common.collect.Lists;
-
import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.jpa.dao.*;
-import ca.uhn.fhir.jpa.dao.data.*;
-import ca.uhn.fhir.jpa.entity.*;
+import ca.uhn.fhir.jpa.dao.DaoConfig;
+import ca.uhn.fhir.jpa.dao.IDao;
+import ca.uhn.fhir.jpa.dao.ISearchBuilder;
+import ca.uhn.fhir.jpa.dao.SearchParameterMap;
+import ca.uhn.fhir.jpa.dao.data.ISearchDao;
+import ca.uhn.fhir.jpa.dao.data.ISearchIncludeDao;
+import ca.uhn.fhir.jpa.dao.data.ISearchResultDao;
+import ca.uhn.fhir.jpa.entity.Search;
+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.util.BaseIterator;
import ca.uhn.fhir.model.dstu2.resource.Patient;
+import ca.uhn.fhir.rest.api.CacheControlDirective;
import ca.uhn.fhir.rest.api.server.IBundleProvider;
import ca.uhn.fhir.rest.param.StringParam;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.util.TestUtil;
+import com.google.common.collect.Lists;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.stubbing.Answer;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.transaction.PlatformTransactionManager;
-@SuppressWarnings({ "unchecked" })
+import javax.persistence.EntityManager;
+import java.util.*;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.same;
+import static org.mockito.Mockito.*;
+
+@SuppressWarnings({"unchecked"})
@RunWith(MockitoJUnitRunner.class)
public class SearchCoordinatorSvcImplTest {
private static FhirContext ourCtx = FhirContext.forDstu3();
+ @Captor
+ ArgumentCaptor> mySearchResultIterCaptor;
@Mock
private IDao myCallingDao;
@Mock
@@ -49,10 +68,6 @@ public class SearchCoordinatorSvcImplTest {
private ISearchIncludeDao mySearchIncludeDao;
@Mock
private ISearchResultDao mySearchResultDao;
- @Captor
- ArgumentCaptor> mySearchResultIterCaptor;
-
-
private SearchCoordinatorSvcImpl mySvc;
@Mock
@@ -63,9 +78,10 @@ public class SearchCoordinatorSvcImplTest {
public void after() {
verify(myCallingDao, atMost(myExpectedNumberOfSearchBuildersCreated)).newSearchBuilder();
}
+
@Before
public void before() {
-
+
mySvc = new SearchCoordinatorSvcImpl();
mySvc.setEntityManagerForUnitTest(myEntityManager);
mySvc.setTransactionManagerForUnitTest(myTxManager);
@@ -76,9 +92,9 @@ public class SearchCoordinatorSvcImplTest {
myDaoConfig = new DaoConfig();
mySvc.setDaoConfigForUnitTest(myDaoConfig);
-
+
when(myCallingDao.newSearchBuilder()).thenReturn(mySearchBuider);
-
+
doAnswer(new Answer() {
@Override
public Void answer(InvocationOnMock theInvocation) throws Throwable {
@@ -89,7 +105,8 @@ public class SearchCoordinatorSvcImplTest {
provider.setEntityManager(myEntityManager);
provider.setContext(ourCtx);
return null;
- }}).when(myCallingDao).injectDependenciesIntoBundleProvider(any(PersistedJpaBundleProvider.class));
+ }
+ }).when(myCallingDao).injectDependenciesIntoBundleProvider(any(PersistedJpaBundleProvider.class));
}
private List createPidSequence(int from, int to) {
@@ -128,7 +145,7 @@ public class SearchCoordinatorSvcImplTest {
doAnswer(loadPids()).when(mySearchBuider).loadResourcesByPid(any(List.class), any(List.class), any(Set.class), anyBoolean(), any(EntityManager.class), any(FhirContext.class), same(myCallingDao));
- IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient");
+ IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient", new CacheControlDirective());
assertNotNull(result.getUuid());
assertEquals(null, result.size());
@@ -146,17 +163,17 @@ public class SearchCoordinatorSvcImplTest {
params.add("name", new StringParam("ANAME"));
List pids = createPidSequence(10, 800);
- Iterator iter = new SlowIterator(pids.iterator(), 2);
+ Iterator iter = new SlowIterator(pids.iterator(), 1);
when(mySearchBuider.createQuery(Mockito.same(params), any(String.class))).thenReturn(iter);
doAnswer(loadPids()).when(mySearchBuider).loadResourcesByPid(any(List.class), any(List.class), any(Set.class), anyBoolean(), any(EntityManager.class), any(FhirContext.class), same(myCallingDao));
- IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient");
+ IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient", new CacheControlDirective());
assertNotNull(result.getUuid());
assertEquals(null, result.size());
List resources;
-
+
resources = result.getResources(0, 100000);
assertEquals(790, resources.size());
assertEquals("10", resources.get(0).getIdElement().getValueAsString());
@@ -164,18 +181,18 @@ public class SearchCoordinatorSvcImplTest {
ArgumentCaptor searchCaptor = ArgumentCaptor.forClass(Search.class);
verify(mySearchDao, atLeastOnce()).save(searchCaptor.capture());
-
+
verify(mySearchResultDao, atLeastOnce()).save(mySearchResultIterCaptor.capture());
- List allResults= new ArrayList();
+ List allResults = new ArrayList();
for (Iterable next : mySearchResultIterCaptor.getAllValues()) {
allResults.addAll(Lists.newArrayList(next));
}
-
+
assertEquals(790, allResults.size());
assertEquals(10, allResults.get(0).getResourcePid().longValue());
assertEquals(799, allResults.get(789).getResourcePid().longValue());
}
-
+
@Test
public void testAsyncSearchLargeResultSetSameCoordinator() {
SearchParameterMap params = new SearchParameterMap();
@@ -187,12 +204,12 @@ public class SearchCoordinatorSvcImplTest {
doAnswer(loadPids()).when(mySearchBuider).loadResourcesByPid(any(List.class), any(List.class), any(Set.class), anyBoolean(), any(EntityManager.class), any(FhirContext.class), same(myCallingDao));
- IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient");
+ IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient", new CacheControlDirective());
assertNotNull(result.getUuid());
assertEquals(null, result.size());
List resources;
-
+
resources = result.getResources(0, 30);
assertEquals(30, resources.size());
assertEquals("10", resources.get(0).getIdElement().getValueAsString());
@@ -202,7 +219,7 @@ public class SearchCoordinatorSvcImplTest {
/**
* Subsequent requests for the same search (i.e. a request for the next
- * page) within the same JVM will not use the original bundle provider
+ * page) within the same JVM will not use the original bundle provider
*/
@Test
public void testAsyncSearchLargeResultSetSecondRequestSameCoordinator() {
@@ -215,7 +232,7 @@ public class SearchCoordinatorSvcImplTest {
doAnswer(loadPids()).when(mySearchBuider).loadResourcesByPid(any(List.class), any(List.class), any(Set.class), anyBoolean(), any(EntityManager.class), any(FhirContext.class), same(myCallingDao));
- IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient");
+ IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient", new CacheControlDirective());
assertNotNull(result.getUuid());
assertEquals(null, result.size());
@@ -223,10 +240,10 @@ public class SearchCoordinatorSvcImplTest {
verify(mySearchDao, atLeast(1)).save(searchCaptor.capture());
Search search = searchCaptor.getValue();
assertEquals(SearchTypeEnum.SEARCH, search.getSearchType());
-
+
List resources;
PersistedJpaBundleProvider provider;
-
+
resources = result.getResources(0, 10);
assertNull(result.size());
assertEquals(10, resources.size());
@@ -244,7 +261,7 @@ public class SearchCoordinatorSvcImplTest {
assertEquals(10, resources.size());
assertEquals("20", resources.get(0).getIdElement().getValueAsString());
assertEquals("29", resources.get(9).getIdElement().getValueAsString());
-
+
provider = new PersistedJpaBundleProvider(result.getUuid(), myCallingDao);
resources = provider.getResources(20, 99999);
assertEquals(770, resources.size());
@@ -265,7 +282,7 @@ public class SearchCoordinatorSvcImplTest {
doAnswer(loadPids()).when(mySearchBuider).loadResourcesByPid(any(List.class), any(List.class), any(Set.class), anyBoolean(), any(EntityManager.class), any(FhirContext.class), same(myCallingDao));
- IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient");
+ IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient", new CacheControlDirective());
assertNotNull(result.getUuid());
assertEquals(90, result.size().intValue());
@@ -285,18 +302,18 @@ public class SearchCoordinatorSvcImplTest {
@Test
public void testLoadSearchResultsFromDifferentCoordinator() {
final String uuid = UUID.randomUUID().toString();
-
+
final Search search = new Search();
search.setUuid(uuid);
search.setSearchType(SearchTypeEnum.SEARCH);
search.setResourceType("Patient");
-
+
when(mySearchDao.findByUuid(eq(uuid))).thenReturn(search);
doAnswer(loadPids()).when(mySearchBuider).loadResourcesByPid(any(List.class), any(List.class), any(Set.class), anyBoolean(), any(EntityManager.class), any(FhirContext.class), same(myCallingDao));
PersistedJpaBundleProvider provider;
List resources;
-
+
new Thread() {
@Override
public void run() {
@@ -305,20 +322,21 @@ public class SearchCoordinatorSvcImplTest {
} catch (InterruptedException e) {
// ignore
}
-
+
when(mySearchResultDao.findWithSearchUuid(any(Search.class), any(Pageable.class))).thenAnswer(new Answer>() {
@Override
public Page answer(InvocationOnMock theInvocation) throws Throwable {
Pageable page = (Pageable) theInvocation.getArguments()[1];
-
+
ArrayList results = new ArrayList();
int max = (page.getPageNumber() * page.getPageSize()) + page.getPageSize();
for (int i = page.getOffset(); i < max; i++) {
results.add(new SearchResult().setResourcePid(i + 10L));
}
-
+
return new PageImpl(results);
- }});
+ }
+ });
search.setStatus(SearchStatusEnum.FINISHED);
}
}.start();
@@ -332,7 +350,7 @@ public class SearchCoordinatorSvcImplTest {
assertEquals(10, resources.size());
assertEquals("20", resources.get(0).getIdElement().getValueAsString());
assertEquals("29", resources.get(9).getIdElement().getValueAsString());
-
+
provider = new PersistedJpaBundleProvider(uuid, myCallingDao);
resources = provider.getResources(20, 40);
assertEquals(20, resources.size());
@@ -353,7 +371,7 @@ public class SearchCoordinatorSvcImplTest {
doAnswer(loadPids()).when(mySearchBuider).loadResourcesByPid(eq(pids), any(List.class), any(Set.class), anyBoolean(), any(EntityManager.class), any(FhirContext.class), same(myCallingDao));
- IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient");
+ IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient", new CacheControlDirective());
assertNull(result.getUuid());
assertEquals(790, result.size().intValue());
@@ -375,7 +393,7 @@ public class SearchCoordinatorSvcImplTest {
pids = createPidSequence(10, 110);
doAnswer(loadPids()).when(mySearchBuider).loadResourcesByPid(eq(pids), any(List.class), any(Set.class), anyBoolean(), any(EntityManager.class), any(FhirContext.class), same(myCallingDao));
- IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient");
+ IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient", new CacheControlDirective());
assertNull(result.getUuid());
assertEquals(100, result.size().intValue());
@@ -394,7 +412,7 @@ public class SearchCoordinatorSvcImplTest {
private int myCount;
private Iterator myWrap;
-
+
public FailAfterNIterator(Iterator theWrap, int theCount) {
myWrap = theWrap;
myCount = theCount;
@@ -416,7 +434,7 @@ public class SearchCoordinatorSvcImplTest {
}
-
+
public static class SlowIterator extends BaseIterator implements Iterator {
private int myDelay;
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/r4/PagingMultinodeProviderR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/r4/PagingMultinodeProviderR4Test.java
index 851f28a3dbf..121debf6f37 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/r4/PagingMultinodeProviderR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/r4/PagingMultinodeProviderR4Test.java
@@ -61,7 +61,7 @@ public class PagingMultinodeProviderR4Test extends BaseResourceProviderR4Test {
mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(10);
mySearchCoordinatorSvcRaw.setNeverUseLocalSearchForUnitTests(true);
- found = ourClient
+ found = myClient
.search()
.forResource(Patient.class)
.sort().ascending(Patient.SP_FAMILY)
@@ -70,19 +70,19 @@ public class PagingMultinodeProviderR4Test extends BaseResourceProviderR4Test {
.execute();
assertThat(toUnqualifiedVersionlessIdValues(found), contains("Patient/A000", "Patient/A001", "Patient/A002", "Patient/A003", "Patient/A004", "Patient/A005", "Patient/A006", "Patient/A007", "Patient/A008", "Patient/A009"));
- found = ourClient
+ found = myClient
.loadPage()
.next(found)
.execute();
assertThat(toUnqualifiedVersionlessIdValues(found), contains("Patient/A010", "Patient/A011", "Patient/A012", "Patient/A013", "Patient/A014", "Patient/A015", "Patient/A016", "Patient/A017", "Patient/A018", "Patient/A019"));
- found = ourClient
+ found = myClient
.loadPage()
.next(found)
.execute();
assertThat(toUnqualifiedVersionlessIdValues(found), contains("Patient/A020", "Patient/A021", "Patient/A022", "Patient/A023", "Patient/A024", "Patient/A025", "Patient/A026", "Patient/A027", "Patient/A028", "Patient/A029"));
- found = ourClient
+ found = myClient
.loadPage()
.next(found)
.execute();
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestDstu3Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestDstu3Test.java
index 82d2f6a02fe..ca346af6e6a 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestDstu3Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/StressTestDstu3Test.java
@@ -1,51 +1,54 @@
package ca.uhn.fhir.jpa.stresstest;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-import java.util.UUID;
-
+import ca.uhn.fhir.jpa.provider.dstu3.BaseResourceProviderDstu3Test;
import ca.uhn.fhir.rest.api.Constants;
+import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor;
+import ca.uhn.fhir.util.TestUtil;
+import com.google.common.base.Charsets;
+import com.google.common.collect.Lists;
import org.apache.commons.io.IOUtils;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.hl7.fhir.dstu3.hapi.validation.FhirInstanceValidator;
-import org.hl7.fhir.dstu3.model.*;
+import org.hl7.fhir.dstu3.model.Bundle;
import org.hl7.fhir.dstu3.model.Bundle.BundleType;
import org.hl7.fhir.dstu3.model.Bundle.HTTPVerb;
-import org.junit.*;
+import org.hl7.fhir.dstu3.model.CodeableConcept;
+import org.hl7.fhir.dstu3.model.Coding;
+import org.hl7.fhir.dstu3.model.Patient;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
-import com.google.common.base.Charsets;
-import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.UUID;
-import ca.uhn.fhir.jpa.provider.dstu3.BaseResourceProviderDstu3Test;
-import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor;
-import ca.uhn.fhir.util.TestUtil;
+import static org.junit.Assert.*;
public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(StressTestDstu3Test.class);
private RequestValidatingInterceptor myRequestValidatingInterceptor;
+ @After
+ public void after() throws Exception {
+ super.after();
+
+ ourRestServer.unregisterInterceptor(myRequestValidatingInterceptor);
+ }
+
@Before
public void before() throws Exception {
super.before();
-
+
myRequestValidatingInterceptor = new RequestValidatingInterceptor();
FhirInstanceValidator module = new FhirInstanceValidator();
module.setValidationSupport(myValidationSupport);
myRequestValidatingInterceptor.addValidatorModule(module);
}
- @After
- public void after() throws Exception {
- super.after();
-
- ourRestServer.unregisterInterceptor(myRequestValidatingInterceptor);
- }
-
@Test
public void testMultithreadedSearch() throws Exception {
Bundle input = new Bundle();
@@ -56,8 +59,8 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
input.addEntry().setResource(p).getRequest().setMethod(HTTPVerb.POST).setUrl("Patient");
}
ourClient.transaction().withBundle(input).execute();
-
-
+
+
List tasks = Lists.newArrayList();
try {
for (int threadIndex = 0; threadIndex < 10; threadIndex++) {
@@ -74,10 +77,9 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
validateNoErrors(tasks);
}
-
-
+
/**
- * This test prevents a deadlock that was detected with a large number of
+ * This test prevents a deadlock that was detected with a large number of
* threads creating resources and blocking on the searchparamcache refreshing
* (since this is a synchronized method) while the instance that was actually
* executing was waiting on a DB connection. This was solved by making
@@ -87,7 +89,7 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
@Test
public void testMultithreadedSearchWithValidation() throws Exception {
ourRestServer.registerInterceptor(myRequestValidatingInterceptor);
-
+
Bundle input = new Bundle();
input.setType(BundleType.TRANSACTION);
for (int i = 0; i < 500; i++) {
@@ -96,7 +98,7 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
input.addEntry().setResource(p).getRequest().setMethod(HTTPVerb.POST).setUrl("Patient");
}
ourClient.transaction().withBundle(input).execute();
-
+
CloseableHttpResponse getMeta = ourHttpClient.execute(new HttpGet(ourServerBase + "/metadata"));
try {
assertEquals(200, getMeta.getStatusLine().getStatusCode());
@@ -133,7 +135,7 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
}
total += next.getTaskCount();
}
-
+
ourLog.info("Loaded {} searches", total);
}
@@ -142,14 +144,14 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
TestUtil.clearAllStaticFieldsForUnitTest();
}
- public class BaseTask extends Thread {
+ public class BaseTask extends Thread {
protected Throwable myError;
protected int myTaskCount = 0;
-
+
public BaseTask() {
setDaemon(true);
}
-
+
public Throwable getError() {
return myError;
}
@@ -168,7 +170,7 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
for (int i = 0; i < 10; i++) {
try {
Bundle respBundle;
-
+
// Load search
HttpGet get = new HttpGet(ourServerBase + "/Patient?identifier=http%3A%2F%2Ftest%7CBAR," + UUID.randomUUID().toString());
get.addHeader(Constants.HEADER_CONTENT_TYPE, Constants.CT_FHIR_JSON_NEW);
@@ -181,7 +183,7 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
} finally {
IOUtils.closeQuietly(getResp);
}
-
+
// Load page 2
get = new HttpGet(respBundle.getLink("next").getUrl());
get.addHeader(Constants.HEADER_CONTENT_TYPE, Constants.CT_FHIR_JSON_NEW);
@@ -194,7 +196,7 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
} finally {
IOUtils.closeQuietly(getResp);
}
-
+
} catch (Throwable e) {
ourLog.error("Failure during search", e);
myError = e;
@@ -214,9 +216,9 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
p.addIdentifier().setSystem("http://test").setValue("BAR").setType(new CodeableConcept().addCoding(new Coding().setSystem("http://foo").setCode("bar")));
p.setGender(org.hl7.fhir.dstu3.model.Enumerations.AdministrativeGender.MALE);
ourClient.create().resource(p).execute();
-
+
ourSearchParamRegistry.forceRefresh();
-
+
} catch (Throwable e) {
ourLog.error("Failure during search", e);
myError = e;
@@ -226,4 +228,5 @@ public class StressTestDstu3Test extends BaseResourceProviderDstu3Test {
}
}
+
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/EmailSubscriptionDstu2Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/EmailSubscriptionDstu2Test.java
index 007872d6992..310b8c515d3 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/EmailSubscriptionDstu2Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/EmailSubscriptionDstu2Test.java
@@ -2,10 +2,9 @@ package ca.uhn.fhir.jpa.subscription;
import ca.uhn.fhir.jpa.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.provider.BaseResourceProviderDstu2Test;
-import ca.uhn.fhir.jpa.subscription.email.EmailDetails;
-import ca.uhn.fhir.jpa.subscription.email.EmailSender;
-import ca.uhn.fhir.jpa.subscription.email.IEmailSender;
+import ca.uhn.fhir.jpa.subscription.email.JavaMailEmailSender;
import ca.uhn.fhir.jpa.subscription.email.SubscriptionEmailInterceptor;
+import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider;
import ca.uhn.fhir.model.dstu2.composite.CodeableConceptDt;
import ca.uhn.fhir.model.dstu2.composite.CodingDt;
import ca.uhn.fhir.model.dstu2.resource.Observation;
@@ -14,11 +13,9 @@ import ca.uhn.fhir.model.dstu2.valueset.ObservationStatusEnum;
import ca.uhn.fhir.model.dstu2.valueset.SubscriptionChannelTypeEnum;
import ca.uhn.fhir.model.dstu2.valueset.SubscriptionStatusEnum;
import ca.uhn.fhir.rest.api.MethodOutcome;
-import com.icegreen.greenmail.imap.ImapConstants;
-import com.icegreen.greenmail.store.MailFolder;
-import com.icegreen.greenmail.store.Store;
import com.icegreen.greenmail.util.GreenMail;
import com.icegreen.greenmail.util.GreenMailUtil;
+import com.icegreen.greenmail.util.ServerSetup;
import com.icegreen.greenmail.util.ServerSetupTest;
import org.hl7.fhir.instance.model.api.IIdType;
import org.junit.*;
@@ -39,6 +36,7 @@ public class EmailSubscriptionDstu2Test extends BaseResourceProviderDstu2Test {
private static final Logger ourLog = LoggerFactory.getLogger(EmailSubscriptionDstu2Test.class);
private static GreenMail ourTestSmtp;
+ private static int ourListenerPort;
private SubscriptionEmailInterceptor mySubscriber;
private List mySubscriptionIds = new ArrayList<>();
@@ -62,15 +60,16 @@ public class EmailSubscriptionDstu2Test extends BaseResourceProviderDstu2Test {
public void before() throws Exception {
super.before();
- EmailSender emailSender = new EmailSender();
- emailSender.setSmtpServerHost("localhost");
- emailSender.setSmtpServerPort(3025);
+ JavaMailEmailSender emailSender = new JavaMailEmailSender();
+ emailSender.setSmtpServerHostname("localhost");
+ emailSender.setSmtpServerPort(ourListenerPort);
emailSender.start();
mySubscriber = new SubscriptionEmailInterceptor();
mySubscriber.setEmailSender(emailSender);
mySubscriber.setResourceDaos(myResourceDaos);
mySubscriber.setFhirContext(myFhirCtx);
+ mySubscriber.setTxManager(ourTxManager);
mySubscriber.start();
ourRestServer.registerInterceptor(mySubscriber);
@@ -128,7 +127,7 @@ public class EmailSubscriptionDstu2Test extends BaseResourceProviderDstu2Test {
@Test
public void testSubscribeAndDeliver() throws Exception {
- String payload = "application/json";
+ String payload = "A subscription update has been received";
String code = "1000000050";
String criteria1 = "Observation?code=SNOMED-CT|" + code + "&_format=xml";
@@ -152,12 +151,12 @@ public class EmailSubscriptionDstu2Test extends BaseResourceProviderDstu2Test {
ourLog.info("Received: " + GreenMailUtil.getWholeMessage(messages[msgIdx]));
assertEquals("HAPI FHIR Subscriptions", messages[msgIdx].getSubject());
assertEquals(1, messages[msgIdx].getFrom().length);
- assertEquals("unknown@sender.com", ((InternetAddress) messages[msgIdx].getFrom()[0]).getAddress());
+ assertEquals("noreply@unknown.com", ((InternetAddress) messages[msgIdx].getFrom()[0]).getAddress());
assertEquals(2, messages[msgIdx].getAllRecipients().length);
assertEquals("to1@example.com", ((InternetAddress) messages[msgIdx].getAllRecipients()[0]).getAddress());
assertEquals("to2@example.com", ((InternetAddress) messages[msgIdx].getAllRecipients()[1]).getAddress());
assertEquals(1, messages[msgIdx].getHeader("Content-Type").length);
- assertEquals("text/plain; charset=UTF-8", messages[msgIdx].getHeader("Content-Type")[0]);
+ assertEquals("text/plain; charset=us-ascii", messages[msgIdx].getHeader("Content-Type")[0]);
String foundBody = GreenMailUtil.getBody(messages[msgIdx]);
assertEquals("A subscription update has been received", foundBody);
@@ -171,7 +170,10 @@ public class EmailSubscriptionDstu2Test extends BaseResourceProviderDstu2Test {
@BeforeClass
public static void beforeClass() {
- ourTestSmtp = new GreenMail(ServerSetupTest.SMTP);
+ ourListenerPort = RandomServerPortProvider.findFreePort();
+ ServerSetup smtp = new ServerSetup(ourListenerPort, null, ServerSetup.PROTOCOL_SMTP);
+ smtp.setServerStartupTimeout(2000);
+ ourTestSmtp = new GreenMail(smtp);
ourTestSmtp.start();
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java
index aa079ac0871..46baafdadfb 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test.java
@@ -72,6 +72,8 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigDstu2Test extends B
public void beforeReset() {
ourCreatedObservations.clear();
ourUpdatedObservations.clear();
+
+ ourRestHookSubscriptionInterceptor.initSubscriptions();
}
private void waitForQueueToDrain() throws InterruptedException {
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu3Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu3Test.java
new file mode 100644
index 00000000000..7e85a05d75e
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSubscriptionDstu3Test.java
@@ -0,0 +1,223 @@
+
+package ca.uhn.fhir.jpa.subscription.email;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.jpa.dao.DaoConfig;
+import ca.uhn.fhir.jpa.provider.dstu3.BaseResourceProviderDstu3Test;
+import ca.uhn.fhir.jpa.subscription.RestHookTestDstu2Test;
+import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider;
+import ca.uhn.fhir.jpa.util.JpaConstants;
+import ca.uhn.fhir.rest.annotation.Create;
+import ca.uhn.fhir.rest.annotation.ResourceParam;
+import ca.uhn.fhir.rest.annotation.Update;
+import ca.uhn.fhir.rest.api.Constants;
+import ca.uhn.fhir.rest.api.MethodOutcome;
+import ca.uhn.fhir.rest.server.IResourceProvider;
+import ca.uhn.fhir.rest.server.RestfulServer;
+import ca.uhn.fhir.util.PortUtil;
+import com.google.common.collect.Lists;
+import com.icegreen.greenmail.store.FolderException;
+import com.icegreen.greenmail.util.GreenMail;
+import com.icegreen.greenmail.util.ServerSetup;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.hl7.fhir.dstu3.model.*;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
+import org.junit.*;
+
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import static org.junit.Assert.*;
+
+/**
+ * Test the rest-hook subscriptions
+ */
+public class EmailSubscriptionDstu3Test extends BaseResourceProviderDstu3Test {
+
+ private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(EmailSubscriptionDstu3Test.class);
+ private static List ourCreatedObservations = Lists.newArrayList();
+ private static int ourListenerPort;
+ private static List ourContentTypes = new ArrayList<>();
+ private static GreenMail ourTestSmtp;
+ private List mySubscriptionIds = new ArrayList<>();
+
+ @After
+ public void afterUnregisterEmailListener() {
+ ourLog.info("**** Starting @After *****");
+
+ for (IIdType next : mySubscriptionIds){
+ ourClient.delete().resourceById(next).execute();
+ }
+ mySubscriptionIds.clear();
+
+ myDaoConfig.setAllowMultipleDelete(true);
+ ourLog.info("Deleting all subscriptions");
+ ourClient.delete().resourceConditionalByUrl("Subscription?status=active").execute();
+ ourClient.delete().resourceConditionalByUrl("Observation?code:missing=false").execute();
+ ourLog.info("Done deleting all subscriptions");
+ myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete());
+
+ ourRestServer.unregisterInterceptor(ourEmailSubscriptionInterceptor);
+
+ }
+
+ @Before
+ public void beforeRegisterEmailListener() throws FolderException {
+ ourTestSmtp.purgeEmailFromAllMailboxes();;
+ ourRestServer.registerInterceptor(ourEmailSubscriptionInterceptor);
+
+ JavaMailEmailSender emailSender = new JavaMailEmailSender();
+ emailSender.setSmtpServerHostname("localhost");
+ emailSender.setSmtpServerPort(ourListenerPort);
+ emailSender.start();
+
+ ourEmailSubscriptionInterceptor.setEmailSender(emailSender);
+ ourEmailSubscriptionInterceptor.setDefaultFromAddress("123@hapifhir.io");
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ ourTestSmtp.stop();
+ }
+
+ @BeforeClass
+ public static void beforeClass() {
+ ourListenerPort = RandomServerPortProvider.findFreePort();
+ ServerSetup smtp = new ServerSetup(ourListenerPort, null, ServerSetup.PROTOCOL_SMTP);
+ smtp.setServerStartupTimeout(2000);
+ ourTestSmtp = new GreenMail(smtp);
+ ourTestSmtp.start();
+ }
+
+
+
+ private Subscription createSubscription(String theCriteria, String thePayload) throws InterruptedException {
+ Subscription subscription = new Subscription();
+ subscription.setReason("Monitor new neonatal function (note, age will be determined by the monitor)");
+ subscription.setStatus(Subscription.SubscriptionStatus.REQUESTED);
+ subscription.setCriteria(theCriteria);
+
+ Subscription.SubscriptionChannelComponent channel = new Subscription.SubscriptionChannelComponent();
+ channel.setType(Subscription.SubscriptionChannelType.EMAIL);
+ channel.setPayload(thePayload);
+ channel.setEndpoint("mailto:foo@example.com");
+ subscription.setChannel(channel);
+
+ MethodOutcome methodOutcome = ourClient.create().resource(subscription).execute();
+ subscription.setId(methodOutcome.getId().getIdPart());
+ mySubscriptionIds.add(methodOutcome.getId());
+
+ waitForQueueToDrain();
+
+ return subscription;
+ }
+
+ private Observation sendObservation(String code, String system) {
+ Observation observation = new Observation();
+ CodeableConcept codeableConcept = new CodeableConcept();
+ observation.setCode(codeableConcept);
+ Coding coding = codeableConcept.addCoding();
+ coding.setCode(code);
+ coding.setSystem(system);
+
+ observation.setStatus(Observation.ObservationStatus.FINAL);
+
+ MethodOutcome methodOutcome = ourClient.create().resource(observation).execute();
+
+ String observationId = methodOutcome.getId().getIdPart();
+ observation.setId(observationId);
+
+ return observation;
+ }
+
+ @Test
+ public void testEmailSubscriptionNormal() throws Exception {
+ String payload = "This is the body";
+
+ String code = "1000000050";
+ String criteria1 = "Observation?code=SNOMED-CT|" + code + "&_format=xml";
+ createSubscription(criteria1, payload);
+ waitForQueueToDrain();
+
+ sendObservation(code, "SNOMED-CT");
+ waitForQueueToDrain();
+
+ waitForSize(1, 20000, new Callable() {
+ @Override
+ public Number call() throws Exception {
+ return ourTestSmtp.getReceivedMessages().length;
+ }
+ });
+
+ List received = Arrays.asList(ourTestSmtp.getReceivedMessages());
+ assertEquals(1, received.get(0).getFrom().length);
+ assertEquals("123@hapifhir.io", ((InternetAddress)received.get(0).getFrom()[0]).getAddress());
+ assertEquals(1, received.get(0).getAllRecipients().length);
+ assertEquals("foo@example.com", ((InternetAddress)received.get(0).getAllRecipients()[0]).getAddress());
+ assertEquals("text/plain; charset=us-ascii", received.get(0).getContentType());
+ assertEquals("This is the body", received.get(0).getContent().toString().trim());
+ assertEquals(mySubscriptionIds.get(0).toUnqualifiedVersionless().getValue(), received.get(0).getHeader("X-FHIR-Subscription")[0]);
+ }
+
+
+ @Test
+ public void testEmailSubscriptionWithCustom() throws Exception {
+ String payload = "This is the body";
+
+ String code = "1000000050";
+ String criteria1 = "Observation?code=SNOMED-CT|" + code + "&_format=xml";
+ Subscription sub1 = createSubscription(criteria1, payload);
+
+ Subscription subscriptionTemp = ourClient.read(Subscription.class, sub1.getId());
+ Assert.assertNotNull(subscriptionTemp);
+ subscriptionTemp.getChannel().addExtension()
+ .setUrl(JpaConstants.EXT_SUBSCRIPTION_EMAIL_FROM)
+ .setValue(new StringType("myfrom@from.com"));
+ subscriptionTemp.getChannel().addExtension()
+ .setUrl(JpaConstants.EXT_SUBSCRIPTION_SUBJECT_TEMPLATE)
+ .setValue(new StringType("This is a subject"));
+ subscriptionTemp.setIdElement(subscriptionTemp.getIdElement().toUnqualifiedVersionless());
+
+
+ ourLog.info(myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(subscriptionTemp));
+
+
+ ourClient.update().resource(subscriptionTemp).withId(subscriptionTemp.getIdElement()).execute();
+ waitForQueueToDrain();
+
+
+ sendObservation(code, "SNOMED-CT");
+ waitForQueueToDrain();
+
+ waitForSize(1, 20000, new Callable() {
+ @Override
+ public Number call() throws Exception {
+ return ourTestSmtp.getReceivedMessages().length;
+ }
+ });
+
+ List received = Arrays.asList(ourTestSmtp.getReceivedMessages());
+ assertEquals(1, received.size());
+ assertEquals(1, received.get(0).getFrom().length);
+ assertEquals("myfrom@from.com", ((InternetAddress)received.get(0).getFrom()[0]).getAddress());
+ assertEquals(1, received.get(0).getAllRecipients().length);
+ assertEquals("foo@example.com", ((InternetAddress)received.get(0).getAllRecipients()[0]).getAddress());
+ assertEquals("text/plain; charset=us-ascii", received.get(0).getContentType());
+ assertEquals("This is a subject", received.get(0).getSubject().toString().trim());
+ assertEquals("This is the body", received.get(0).getContent().toString().trim());
+ assertEquals(mySubscriptionIds.get(0).toUnqualifiedVersionless().getValue(), received.get(0).getHeader("X-FHIR-Subscription")[0]);
+ }
+
+ private void waitForQueueToDrain() throws InterruptedException {
+ RestHookTestDstu2Test.waitForQueueToDrain(ourEmailSubscriptionInterceptor);
+ }
+
+}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSenderTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/JavaMailEmailSenderTest.java
similarity index 66%
rename from hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSenderTest.java
rename to hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/JavaMailEmailSenderTest.java
index b86ad483d6b..828441acb29 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/EmailSenderTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/email/JavaMailEmailSenderTest.java
@@ -1,8 +1,10 @@
package ca.uhn.fhir.jpa.subscription.email;
+import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider;
import com.icegreen.greenmail.util.GreenMail;
import com.icegreen.greenmail.util.GreenMailUtil;
-import com.icegreen.greenmail.util.ServerSetupTest;
+import com.icegreen.greenmail.util.ServerSetup;
+import org.hl7.fhir.dstu3.model.IdType;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -15,21 +17,25 @@ import java.util.Arrays;
import static org.junit.Assert.*;
-public class EmailSenderTest {
+public class JavaMailEmailSenderTest {
- private static final Logger ourLog = LoggerFactory.getLogger(EmailSenderTest.class);
+ private static final Logger ourLog = LoggerFactory.getLogger(JavaMailEmailSenderTest.class);
private static GreenMail ourTestSmtp;
+ private static int ourPort;
@Test
public void testSend() throws Exception {
- EmailSender sender = new EmailSender();
- sender.setSmtpServerHost("localhost");
- sender.setSmtpServerPort(3025);
+ JavaMailEmailSender sender = new JavaMailEmailSender();
+ sender.setSmtpServerHostname("localhost");
+ sender.setSmtpServerPort(ourPort);
+ sender.setSmtpServerUsername(null);
+ sender.setSmtpServerPassword(null);
sender.start();
String body = "foo";
EmailDetails details = new EmailDetails();
+ details.setSubscription(new IdType("Subscription/123"));
details.setFrom("foo@example.com ");
details.setTo(Arrays.asList(" to1@example.com", "to2@example.com "));
details.setSubjectTemplate("test subject");
@@ -46,7 +52,7 @@ public class EmailSenderTest {
assertEquals("to1@example.com", ((InternetAddress)messages[0].getAllRecipients()[0]).getAddress());
assertEquals("to2@example.com", ((InternetAddress)messages[0].getAllRecipients()[1]).getAddress());
assertEquals(1, messages[0].getHeader("Content-Type").length);
- assertEquals("text/plain; charset=UTF-8", messages[0].getHeader("Content-Type")[0]);
+ assertEquals("text/plain; charset=us-ascii", messages[0].getHeader("Content-Type")[0]);
String foundBody = GreenMailUtil.getBody(messages[0]);
assertEquals("foo", foundBody);
}
@@ -58,7 +64,10 @@ public class EmailSenderTest {
@BeforeClass
public static void beforeClass() {
- ourTestSmtp = new GreenMail(ServerSetupTest.SMTP);
+ ourPort = RandomServerPortProvider.findFreePort();
+ ServerSetup smtp = new ServerSetup(ourPort, null, ServerSetup.PROTOCOL_SMTP);
+ smtp.setServerStartupTimeout(2000);
+ ourTestSmtp = new GreenMail(smtp);
ourTestSmtp.start();
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookActivatesPreExistingSubscriptionsR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookActivatesPreExistingSubscriptionsR4Test.java
index 27b6935593e..9dea424bd06 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookActivatesPreExistingSubscriptionsR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookActivatesPreExistingSubscriptionsR4Test.java
@@ -54,7 +54,7 @@ public class RestHookActivatesPreExistingSubscriptionsR4Test extends BaseResourc
channel.setPayload(thePayload);
channel.setEndpoint(theEndpoint);
- MethodOutcome methodOutcome = ourClient.create().resource(subscription).execute();
+ MethodOutcome methodOutcome = myClient.create().resource(subscription).execute();
subscription.setId(methodOutcome.getId().getIdPart());
waitForQueueToDrain();
@@ -71,7 +71,7 @@ public class RestHookActivatesPreExistingSubscriptionsR4Test extends BaseResourc
observation.setStatus(Observation.ObservationStatus.FINAL);
- MethodOutcome methodOutcome = ourClient.create().resource(observation).execute();
+ MethodOutcome methodOutcome = myClient.create().resource(observation).execute();
String observationId = methodOutcome.getId().getIdPart();
observation.setId(observationId);
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookTestR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookTestR4Test.java
index 515e85d82e4..a8a5d3a702d 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookTestR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookTestR4Test.java
@@ -51,14 +51,16 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
@After
public void afterUnregisterRestHookListener() {
for (IIdType next : mySubscriptionIds) {
- ourClient.delete().resourceById(next).execute();
+ IIdType nextId = next.toUnqualifiedVersionless();
+ ourLog.info("Deleting: {}", nextId);
+ myClient.delete().resourceById(nextId).execute();
}
mySubscriptionIds.clear();
myDaoConfig.setAllowMultipleDelete(true);
ourLog.info("Deleting all subscriptions");
- ourClient.delete().resourceConditionalByUrl("Subscription?status=active").execute();
- ourClient.delete().resourceConditionalByUrl("Observation?code:missing=false").execute();
+ myClient.delete().resourceConditionalByUrl("Subscription?status=active").execute();
+ myClient.delete().resourceConditionalByUrl("Observation?code:missing=false").execute();
ourLog.info("Done deleting all subscriptions");
myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete());
@@ -89,7 +91,7 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
channel.setPayload(thePayload);
channel.setEndpoint(theEndpoint);
- MethodOutcome methodOutcome = ourClient.create().resource(subscription).execute();
+ MethodOutcome methodOutcome = myClient.create().resource(subscription).execute();
subscription.setId(methodOutcome.getId().getIdPart());
mySubscriptionIds.add(methodOutcome.getId());
@@ -107,7 +109,7 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
observation.setStatus(Observation.ObservationStatus.FINAL);
- MethodOutcome methodOutcome = ourClient.create().resource(observation).execute();
+ MethodOutcome methodOutcome = myClient.create().resource(observation).execute();
String observationId = methodOutcome.getId().getIdPart();
observation.setId(observationId);
@@ -154,11 +156,11 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
waitForSize(1, ourUpdatedObservations);
assertEquals(Constants.CT_FHIR_JSON_NEW, ourContentTypes.get(0));
- Subscription subscriptionTemp = ourClient.read(Subscription.class, subscription2.getId());
+ Subscription subscriptionTemp = myClient.read(Subscription.class, subscription2.getId());
Assert.assertNotNull(subscriptionTemp);
subscriptionTemp.setCriteria(criteria1);
- ourClient.update().resource(subscriptionTemp).withId(subscriptionTemp.getIdElement()).execute();
+ myClient.update().resource(subscriptionTemp).withId(subscriptionTemp.getIdElement()).execute();
waitForQueueToDrain();
Observation observation2 = sendObservation(code, "SNOMED-CT");
@@ -168,7 +170,7 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
waitForSize(0, ourCreatedObservations);
waitForSize(3, ourUpdatedObservations);
- ourClient.delete().resourceById(new IdType("Subscription/" + subscription2.getId())).execute();
+ myClient.delete().resourceById(new IdType("Subscription/" + subscription2.getId())).execute();
waitForQueueToDrain();
Observation observationTemp3 = sendObservation(code, "SNOMED-CT");
@@ -178,27 +180,27 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
waitForSize(0, ourCreatedObservations);
waitForSize(4, ourUpdatedObservations);
- Observation observation3 = ourClient.read(Observation.class, observationTemp3.getId());
+ Observation observation3 = myClient.read(Observation.class, observationTemp3.getId());
CodeableConcept codeableConcept = new CodeableConcept();
observation3.setCode(codeableConcept);
Coding coding = codeableConcept.addCoding();
coding.setCode(code + "111");
coding.setSystem("SNOMED-CT");
- ourClient.update().resource(observation3).withId(observation3.getIdElement()).execute();
+ myClient.update().resource(observation3).withId(observation3.getIdElement()).execute();
// Should see no subscription notification
waitForQueueToDrain();
waitForSize(0, ourCreatedObservations);
waitForSize(4, ourUpdatedObservations);
- Observation observation3a = ourClient.read(Observation.class, observationTemp3.getId());
+ Observation observation3a = myClient.read(Observation.class, observationTemp3.getId());
CodeableConcept codeableConcept1 = new CodeableConcept();
observation3a.setCode(codeableConcept1);
Coding coding1 = codeableConcept1.addCoding();
coding1.setCode(code);
coding1.setSystem("SNOMED-CT");
- ourClient.update().resource(observation3a).withId(observation3a.getIdElement()).execute();
+ myClient.update().resource(observation3a).withId(observation3a.getIdElement()).execute();
// Should see only one subscription notification
waitForQueueToDrain();
@@ -229,10 +231,10 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
waitForSize(1, ourUpdatedObservations);
assertEquals(Constants.CT_FHIR_XML_NEW, ourContentTypes.get(0));
- Subscription subscriptionTemp = ourClient.read(Subscription.class, subscription2.getId());
+ Subscription subscriptionTemp = myClient.read(Subscription.class, subscription2.getId());
Assert.assertNotNull(subscriptionTemp);
subscriptionTemp.setCriteria(criteria1);
- ourClient.update().resource(subscriptionTemp).withId(subscriptionTemp.getIdElement()).execute();
+ myClient.update().resource(subscriptionTemp).withId(subscriptionTemp.getIdElement()).execute();
waitForQueueToDrain();
Observation observation2 = sendObservation(code, "SNOMED-CT");
@@ -242,7 +244,7 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
waitForSize(0, ourCreatedObservations);
waitForSize(3, ourUpdatedObservations);
- ourClient.delete().resourceById(new IdType("Subscription/" + subscription2.getId())).execute();
+ myClient.delete().resourceById(new IdType("Subscription/" + subscription2.getId())).execute();
Observation observationTemp3 = sendObservation(code, "SNOMED-CT");
@@ -251,27 +253,27 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
waitForSize(0, ourCreatedObservations);
waitForSize(4, ourUpdatedObservations);
- Observation observation3 = ourClient.read(Observation.class, observationTemp3.getId());
+ Observation observation3 = myClient.read(Observation.class, observationTemp3.getId());
CodeableConcept codeableConcept = new CodeableConcept();
observation3.setCode(codeableConcept);
Coding coding = codeableConcept.addCoding();
coding.setCode(code + "111");
coding.setSystem("SNOMED-CT");
- ourClient.update().resource(observation3).withId(observation3.getIdElement()).execute();
+ myClient.update().resource(observation3).withId(observation3.getIdElement()).execute();
// Should see no subscription notification
waitForQueueToDrain();
waitForSize(0, ourCreatedObservations);
waitForSize(4, ourUpdatedObservations);
- Observation observation3a = ourClient.read(Observation.class, observationTemp3.getId());
+ Observation observation3a = myClient.read(Observation.class, observationTemp3.getId());
CodeableConcept codeableConcept1 = new CodeableConcept();
observation3a.setCode(codeableConcept1);
Coding coding1 = codeableConcept1.addCoding();
coding1.setCode(code);
coding1.setSystem("SNOMED-CT");
- ourClient.update().resource(observation3a).withId(observation3a.getIdElement()).execute();
+ myClient.update().resource(observation3a).withId(observation3a.getIdElement()).execute();
// Should see only one subscription notification
waitForQueueToDrain();
@@ -331,7 +333,7 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
subscription.getChannel().addHeader("X-Foo: FOO");
subscription.getChannel().addHeader("X-Bar: BAR");
subscription.setStatus(Subscription.SubscriptionStatus.REQUESTED);
- ourClient.update().resource(subscription).execute();
+ myClient.update().resource(subscription).execute();
waitForQueueToDrain();
sendObservation(code, "SNOMED-CT");
@@ -362,7 +364,7 @@ public class RestHookTestR4Test extends BaseResourceProviderR4Test {
// Disable
subscription.setStatus(Subscription.SubscriptionStatus.OFF);
- ourClient.update().resource(subscription).execute();
+ myClient.update().resource(subscription).execute();
waitForQueueToDrain();
// Send another object
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java
index 48c54cdedee..32e418e82a8 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookTestWithInterceptorRegisteredToDaoConfigR4Test.java
@@ -1,8 +1,6 @@
package ca.uhn.fhir.jpa.subscription.r4;
-import static org.junit.Assert.*;
-
import java.util.List;
import org.eclipse.jetty.server.Server;
@@ -46,7 +44,7 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigR4Test extends Base
public void afterUnregisterRestHookListener() {
myDaoConfig.setAllowMultipleDelete(true);
ourLog.info("Deleting all subscriptions");
- ourClient.delete().resourceConditionalByUrl("Subscription?status=active").execute();
+ myClient.delete().resourceConditionalByUrl("Subscription?status=active").execute();
ourLog.info("Done deleting all subscriptions");
myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete());
@@ -76,7 +74,7 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigR4Test extends Base
channel.setEndpoint(endpoint);
subscription.setChannel(channel);
- MethodOutcome methodOutcome = ourClient.create().resource(subscription).execute();
+ MethodOutcome methodOutcome = myClient.create().resource(subscription).execute();
subscription.setId(methodOutcome.getId().getIdPart());
waitForQueueToDrain();
@@ -101,7 +99,7 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigR4Test extends Base
observation.setStatus(Observation.ObservationStatus.FINAL);
- MethodOutcome methodOutcome = ourClient.create().resource(observation).execute();
+ MethodOutcome methodOutcome = myClient.create().resource(observation).execute();
String observationId = methodOutcome.getId().getIdPart();
observation.setId(observationId);
@@ -129,11 +127,11 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigR4Test extends Base
waitForSize(0, ourCreatedObservations);
waitForSize(1, ourUpdatedObservations);
- Subscription subscriptionTemp = ourClient.read(Subscription.class, subscription2.getId());
+ Subscription subscriptionTemp = myClient.read(Subscription.class, subscription2.getId());
Assert.assertNotNull(subscriptionTemp);
subscriptionTemp.setCriteria(criteria1);
- ourClient.update().resource(subscriptionTemp).withId(subscriptionTemp.getIdElement()).execute();
+ myClient.update().resource(subscriptionTemp).withId(subscriptionTemp.getIdElement()).execute();
Observation observation2 = sendObservation(code, "SNOMED-CT");
@@ -143,7 +141,7 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigR4Test extends Base
waitForSize(0, ourCreatedObservations);
waitForSize(3, ourUpdatedObservations);
- ourClient.delete().resourceById(new IdDt("Subscription", subscription2.getId())).execute();
+ myClient.delete().resourceById(new IdDt("Subscription", subscription2.getId())).execute();
Observation observationTemp3 = sendObservation(code, "SNOMED-CT");
@@ -152,27 +150,27 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigR4Test extends Base
waitForSize(0, ourCreatedObservations);
waitForSize(4, ourUpdatedObservations);
- Observation observation3 = ourClient.read(Observation.class, observationTemp3.getId());
+ Observation observation3 = myClient.read(Observation.class, observationTemp3.getId());
CodeableConcept codeableConcept = new CodeableConcept();
observation3.setCode(codeableConcept);
Coding coding = codeableConcept.addCoding();
coding.setCode(code + "111");
coding.setSystem("SNOMED-CT");
- ourClient.update().resource(observation3).withId(observation3.getIdElement()).execute();
+ myClient.update().resource(observation3).withId(observation3.getIdElement()).execute();
// Should see no subscription notification
Thread.sleep(500);
waitForSize(0, ourCreatedObservations);
waitForSize(4, ourUpdatedObservations);
- Observation observation3a = ourClient.read(Observation.class, observationTemp3.getId());
+ Observation observation3a = myClient.read(Observation.class, observationTemp3.getId());
CodeableConcept codeableConcept1 = new CodeableConcept();
observation3a.setCode(codeableConcept1);
Coding coding1 = codeableConcept1.addCoding();
coding1.setCode(code);
coding1.setSystem("SNOMED-CT");
- ourClient.update().resource(observation3a).withId(observation3a.getIdElement()).execute();
+ myClient.update().resource(observation3a).withId(observation3a.getIdElement()).execute();
// Should see only one subscription notification
Thread.sleep(500);
@@ -202,11 +200,11 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigR4Test extends Base
waitForSize(0, ourCreatedObservations);
waitForSize(1, ourUpdatedObservations);
- Subscription subscriptionTemp = ourClient.read(Subscription.class, subscription2.getId());
+ Subscription subscriptionTemp = myClient.read(Subscription.class, subscription2.getId());
Assert.assertNotNull(subscriptionTemp);
subscriptionTemp.setCriteria(criteria1);
- ourClient.update().resource(subscriptionTemp).withId(subscriptionTemp.getIdElement()).execute();
+ myClient.update().resource(subscriptionTemp).withId(subscriptionTemp.getIdElement()).execute();
Observation observation2 = sendObservation(code, "SNOMED-CT");
@@ -216,7 +214,7 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigR4Test extends Base
waitForSize(0, ourCreatedObservations);
waitForSize(3, ourUpdatedObservations);
- ourClient.delete().resourceById(new IdDt("Subscription", subscription2.getId())).execute();
+ myClient.delete().resourceById(new IdDt("Subscription", subscription2.getId())).execute();
Observation observationTemp3 = sendObservation(code, "SNOMED-CT");
@@ -225,27 +223,27 @@ public class RestHookTestWithInterceptorRegisteredToDaoConfigR4Test extends Base
waitForSize(0, ourCreatedObservations);
waitForSize(4, ourUpdatedObservations);
- Observation observation3 = ourClient.read(Observation.class, observationTemp3.getId());
+ Observation observation3 = myClient.read(Observation.class, observationTemp3.getId());
CodeableConcept codeableConcept = new CodeableConcept();
observation3.setCode(codeableConcept);
Coding coding = codeableConcept.addCoding();
coding.setCode(code + "111");
coding.setSystem("SNOMED-CT");
- ourClient.update().resource(observation3).withId(observation3.getIdElement()).execute();
+ myClient.update().resource(observation3).withId(observation3.getIdElement()).execute();
// Should see no subscription notification
waitForQueueToDrain();
waitForSize(0, ourCreatedObservations);
waitForSize(4, ourUpdatedObservations);
- Observation observation3a = ourClient.read(Observation.class, observationTemp3.getId());
+ Observation observation3a = myClient.read(Observation.class, observationTemp3.getId());
CodeableConcept codeableConcept1 = new CodeableConcept();
observation3a.setCode(codeableConcept1);
Coding coding1 = codeableConcept1.addCoding();
coding1.setCode(code);
coding1.setSystem("SNOMED-CT");
- ourClient.update().resource(observation3a).withId(observation3a.getIdElement()).execute();
+ myClient.update().resource(observation3a).withId(observation3a.getIdElement()).execute();
// Should see only one subscription notification
waitForQueueToDrain();
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookWithEventDefinitionR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookWithEventDefinitionR4Test.java
index 2a0eae5a583..d32b823f680 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookWithEventDefinitionR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/RestHookWithEventDefinitionR4Test.java
@@ -52,14 +52,14 @@ public class RestHookWithEventDefinitionR4Test extends BaseResourceProviderR4Tes
@After
public void afterUnregisterRestHookListener() {
for (IIdType next : mySubscriptionIds) {
- ourClient.delete().resourceById(next).execute();
+ myClient.delete().resourceById(next).execute();
}
mySubscriptionIds.clear();
myDaoConfig.setAllowMultipleDelete(true);
ourLog.info("Deleting all subscriptions");
- ourClient.delete().resourceConditionalByUrl("Subscription?status=active").execute();
- ourClient.delete().resourceConditionalByUrl("Observation?code:missing=false").execute();
+ myClient.delete().resourceConditionalByUrl("Subscription?status=active").execute();
+ myClient.delete().resourceConditionalByUrl("Observation?code:missing=false").execute();
ourLog.info("Done deleting all subscriptions");
myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete());
@@ -83,7 +83,7 @@ public class RestHookWithEventDefinitionR4Test extends BaseResourceProviderR4Tes
*/
Patient patient = FhirR4Util.getPatient();
- MethodOutcome methodOutcome = ourClient.create().resource(patient).execute();
+ MethodOutcome methodOutcome = myClient.create().resource(patient).execute();
myPatientId = methodOutcome.getId().getIdPart();
/*
@@ -114,7 +114,7 @@ public class RestHookWithEventDefinitionR4Test extends BaseResourceProviderR4Tes
channel.setPayload("application/json");
subscription.setChannel(channel);
- methodOutcome = ourClient.create().resource(subscription).execute();
+ methodOutcome = myClient.create().resource(subscription).execute();
mySubscriptionId = methodOutcome.getId().getIdPart();
}
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/WebsocketWithCriteriaR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/WebsocketWithCriteriaR4Test.java
index dfe9b283c9f..316c9caeba3 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/WebsocketWithCriteriaR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/WebsocketWithCriteriaR4Test.java
@@ -49,7 +49,7 @@ public class WebsocketWithCriteriaR4Test extends BaseResourceProviderR4Test {
*/
Patient patient = FhirR4Util.getPatient();
- MethodOutcome methodOutcome = ourClient.create().resource(patient).execute();
+ MethodOutcome methodOutcome = myClient.create().resource(patient).execute();
myPatientId = methodOutcome.getId().getIdPart();
/*
@@ -66,7 +66,7 @@ public class WebsocketWithCriteriaR4Test extends BaseResourceProviderR4Test {
channel.setPayload("application/json");
subscription.setChannel(channel);
- methodOutcome = ourClient.create().resource(subscription).execute();
+ methodOutcome = myClient.create().resource(subscription).execute();
mySubscriptionId = methodOutcome.getId().getIdPart();
/*
@@ -105,7 +105,7 @@ public class WebsocketWithCriteriaR4Test extends BaseResourceProviderR4Test {
observation.setSubject(reference);
observation.setStatus(Observation.ObservationStatus.FINAL);
- MethodOutcome methodOutcome2 = ourClient.create().resource(observation).execute();
+ MethodOutcome methodOutcome2 = myClient.create().resource(observation).execute();
String observationId = methodOutcome2.getId().getIdPart();
observation.setId(observationId);
@@ -129,7 +129,7 @@ public class WebsocketWithCriteriaR4Test extends BaseResourceProviderR4Test {
observation.setSubject(reference);
observation.setStatus(Observation.ObservationStatus.FINAL);
- MethodOutcome methodOutcome2 = ourClient.create().resource(observation).execute();
+ MethodOutcome methodOutcome2 = myClient.create().resource(observation).execute();
String observationId = methodOutcome2.getId().getIdPart();
observation.setId(observationId);
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/WebsocketWithSubscriptionIdR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/WebsocketWithSubscriptionIdR4Test.java
index 4aca0fcc419..90a973e69e6 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/WebsocketWithSubscriptionIdR4Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/r4/WebsocketWithSubscriptionIdR4Test.java
@@ -72,7 +72,7 @@ public class WebsocketWithSubscriptionIdR4Test extends BaseResourceProviderR4Tes
*/
Patient patient = FhirR4Util.getPatient();
- MethodOutcome methodOutcome = ourClient.create().resource(patient).execute();
+ MethodOutcome methodOutcome = myClient.create().resource(patient).execute();
myPatientId = methodOutcome.getId().getIdPart();
/*
@@ -89,7 +89,7 @@ public class WebsocketWithSubscriptionIdR4Test extends BaseResourceProviderR4Tes
channel.setPayload("application/json");
subscription.setChannel(channel);
- methodOutcome = ourClient.create().resource(subscription).execute();
+ methodOutcome = myClient.create().resource(subscription).execute();
mySubscriptionId = methodOutcome.getId().getIdPart();
/*
@@ -122,7 +122,7 @@ public class WebsocketWithSubscriptionIdR4Test extends BaseResourceProviderR4Tes
observation.setSubject(reference);
observation.setStatus(Observation.ObservationStatus.FINAL);
- MethodOutcome methodOutcome2 = ourClient.create().resource(observation).execute();
+ MethodOutcome methodOutcome2 = myClient.create().resource(observation).execute();
String observationId = methodOutcome2.getId().getIdPart();
observation.setId(observationId);
@@ -146,7 +146,7 @@ public class WebsocketWithSubscriptionIdR4Test extends BaseResourceProviderR4Tes
observation.setSubject(reference);
observation.setStatus(Observation.ObservationStatus.FINAL);
- MethodOutcome methodOutcome2 = ourClient.create().resource(observation).execute();
+ MethodOutcome methodOutcome2 = myClient.create().resource(observation).execute();
String observationId = methodOutcome2.getId().getIdPart();
observation.setId(observationId);
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/dstu3-person.json b/hapi-fhir-jpaserver-base/src/test/resources/dstu3-person.json
new file mode 100644
index 00000000000..ad7edea379b
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/test/resources/dstu3-person.json
@@ -0,0 +1,52 @@
+ {
+ "resourceType": "Person",
+ "id": "PERSON1",
+ "meta": {
+ "versionId": "1",
+ "lastUpdated": "2017-08-17T16:19:40.109+03:00"
+ },
+ "identifier": [
+ {
+ "value": "081181-9984"
+ }
+ ],
+ "name": [
+ {
+ "text": "Anna Testi",
+ "family": "Testi",
+ "given": [
+ "Anna"
+ ]
+ },
+ {
+ "family": "asdfas"
+ }
+ ],
+ "telecom": [
+ {
+ "use": "home"
+ },
+ {
+ "system": "phone",
+ "value": "(044) 1234567",
+ "use": "work"
+ }
+ ],
+ "gender": "female",
+ "birthDate": "1981-11-08",
+ "address": [
+ {
+ "line": [
+ "Osuuspankkitie 2"
+ ],
+ "city": "Helsinki",
+ "postalCode": "00120",
+ "country": "Suomi"
+ },
+ {
+ "city": "Blo-49847020"
+ }
+ ],
+ "active": true
+ }
+
diff --git a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
index 39d8f8970a3..4bba1d9adc6 100644
--- a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
+++ b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/web.xml
@@ -76,7 +76,7 @@
A comma separated list of allowed headers when making a non simple CORS request.
cors.allowed.headers
- X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers
+ X-FHIR-Starter,Origin,Accept,X-Requested-With,Content-Type,Access-Control-Request-Method,Access-Control-Request-Headers,Prefer
A comma separated list non-standard response headers that will be exposed to XHR2 object.
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/derby_maintenance.txt b/hapi-fhir-jpaserver-uhnfhirtest/derby_maintenance.txt
index 21e69afe88a..1e8c7df6044 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/derby_maintenance.txt
+++ b/hapi-fhir-jpaserver-uhnfhirtest/derby_maintenance.txt
@@ -74,4 +74,24 @@ drop table trm_concept cascade constraints;
drop table trm_concept_pc_link cascade constraints;
drop table trm_concept_property cascade constraints;
+# Delete all resources
+update hfj_res_ver set forced_id_pid = null where res_id in (select res_id from hfj_resource);
+update hfj_resource set forced_id_pid = null where res_id in (select res_id from hfj_resource);
+delete from hfj_history_tag where res_id in (select res_id from hfj_resource);
+delete from hfj_res_ver where res_id in (select res_id from hfj_resource);
+delete from hfj_forced_id where resource_pid in (select res_id from hfj_resource);
+delete from hfj_res_link where src_resource_id in (select res_id from hfj_resource);
+delete from hfj_res_link where target_resource_id in (select res_id from hfj_resource);
+delete from hfj_spidx_coords where res_id in (select res_id from hfj_resource);
+delete from hfj_spidx_date where res_id in (select res_id from hfj_resource);
+delete from hfj_spidx_number where res_id in (select res_id from hfj_resource);
+delete from hfj_spidx_quantity where res_id in (select res_id from hfj_resource);
+delete from hfj_spidx_string where res_id in (select res_id from hfj_resource);
+delete from hfj_spidx_token where res_id in (select res_id from hfj_resource);
+delete from hfj_spidx_uri where res_id in (select res_id from hfj_resource);
+delete from hfj_res_tag where res_id in (select res_id from hfj_resource);
+delete from hfj_search_result where resource_pid in (select res_id from hfj_resource);
+delete from hfj_res_param_present where res_id in (select res_id from hfj_resource);
+delete from hfj_resource where res_id in (select res_id from hfj_resource);
+
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
index ab5189cdbe7..a77e7c7b5de 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
@@ -173,18 +173,7 @@ public class TestRestfulServer extends RestfulServer {
/*
* Enable CORS
*/
- CorsConfiguration config = new CorsConfiguration();
- CorsInterceptor corsInterceptor = new CorsInterceptor(config);
- config.addAllowedHeader("Origin");
- config.addAllowedHeader("Accept");
- config.addAllowedHeader("X-Requested-With");
- config.addAllowedHeader("Content-Type");
- config.addAllowedHeader("Access-Control-Request-Method");
- config.addAllowedHeader("Access-Control-Request-Headers");
- config.addAllowedOrigin("*");
- config.addExposedHeader("Location");
- config.addExposedHeader("Content-Location");
- config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"));
+ CorsInterceptor corsInterceptor = new CorsInterceptor();
registerInterceptor(corsInterceptor);
/*
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TdlDstu2Config.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TdlDstu2Config.java
index 47380b48473..bf568c7d1c9 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TdlDstu2Config.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TdlDstu2Config.java
@@ -67,6 +67,7 @@ public class TdlDstu2Config extends BaseJavaConfigDstu2 {
retVal.getTreatBaseUrlsAsLocal().add("http://fhirtest.uhn.ca/testDataLibraryDstu2");
retVal.getTreatBaseUrlsAsLocal().add("https://fhirtest.uhn.ca/testDataLibraryDstu2");
retVal.setIndexMissingFields(DaoConfig.IndexEnabledEnum.ENABLED);
+ retVal.setCountSearchResultsUpTo(TestR4Config.COUNT_SEARCH_RESULTS_UP_TO);
return retVal;
}
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TdlDstu3Config.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TdlDstu3Config.java
index 052d974092d..45be4c9e38b 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TdlDstu3Config.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TdlDstu3Config.java
@@ -57,6 +57,7 @@ public class TdlDstu3Config extends BaseJavaConfigDstu3 {
retVal.getTreatBaseUrlsAsLocal().add("http://fhirtest.uhn.ca/testDataLibraryStu3");
retVal.getTreatBaseUrlsAsLocal().add("https://fhirtest.uhn.ca/testDataLibraryStu3");
retVal.setIndexMissingFields(DaoConfig.IndexEnabledEnum.ENABLED);
+ retVal.setCountSearchResultsUpTo(TestR4Config.COUNT_SEARCH_RESULTS_UP_TO);
return retVal;
}
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java
index 609b537f500..d76e45b40f2 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java
@@ -34,6 +34,7 @@ public class TestR4Config extends BaseJavaConfigR4 {
public static final String FHIR_DB_USERNAME = "${fhir.db.username}";
public static final String FHIR_DB_PASSWORD = "${fhir.db.password}";
public static final String FHIR_LUCENE_LOCATION_R4 = "${fhir.lucene.location.r4}";
+ public static final Integer COUNT_SEARCH_RESULTS_UP_TO = 50000;
@Value(TestR4Config.FHIR_DB_USERNAME)
private String myDbUsername;
@@ -56,6 +57,7 @@ public class TestR4Config extends BaseJavaConfigR4 {
retVal.getTreatBaseUrlsAsLocal().add("http://fhirtest.uhn.ca/baseR4");
retVal.getTreatBaseUrlsAsLocal().add("https://fhirtest.uhn.ca/baseR4");
retVal.setIndexMissingFields(DaoConfig.IndexEnabledEnum.ENABLED);
+ retVal.setCountSearchResultsUpTo(TestR4Config.COUNT_SEARCH_RESULTS_UP_TO);
return retVal;
}
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
index 8a3910f4f5e..ca5d8cba655 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/IncomingRequestAddressStrategy.java
@@ -34,6 +34,9 @@ public class IncomingRequestAddressStrategy implements IServerAddressStrategy {
@Override
public String determineServerBase(ServletContext theServletContext, HttpServletRequest theRequest) {
+ if (theRequest == null) {
+ return null;
+ }
String requestFullPath = StringUtils.defaultString(theRequest.getRequestURI());
String servletPath;
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
index a8e7e94a0ed..0dfb36051e9 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerUtils.java
@@ -29,6 +29,7 @@ import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
+import ca.uhn.fhir.util.BinaryUtil;
import org.hl7.fhir.instance.model.api.*;
import ca.uhn.fhir.context.FhirContext;
@@ -85,10 +86,41 @@ public class RestfulServerUtils {
}
}
if (elements != null && elements.size() > 0) {
- Set newElements = new HashSet();
+ Set newElements = new HashSet<>();
for (String next : elements) {
newElements.add("*." + next);
}
+
+ /*
+ * We try to be smart about what the user is asking for
+ * when they include an _elements parameter. If we're responding
+ * to something that returns a Bundle (e.g. a search) we assume
+ * the elements don't apply to the Bundle itself, unless
+ * the client has explicitly scoped the Bundle
+ * (i.e. with Bundle.total or something like that)
+ */
+ switch (theRequestDetails.getRestOperationType()) {
+ case SEARCH_SYSTEM:
+ case SEARCH_TYPE:
+ case HISTORY_SYSTEM:
+ case HISTORY_TYPE:
+ case HISTORY_INSTANCE:
+ case GET_PAGE:
+ boolean haveExplicitBundleElement = false;
+ for (String next : newElements) {
+ if (next.startsWith("Bundle.")) {
+ haveExplicitBundleElement = true;
+ break;
+ }
+ }
+ if (!haveExplicitBundleElement) {
+ parser.setEncodeElementsAppliesToChildResourcesOnly(true);
+ }
+ break;
+ default:
+ break;
+ }
+
parser.setEncodeElements(newElements);
parser.setEncodeElementsAppliesToResourceTypes(elementsAppliesTo);
}
@@ -146,6 +178,19 @@ public class RestfulServerUtils {
b.append(theBundleType.getCode());
}
+ String paramName = Constants.PARAM_ELEMENTS;
+ String[] params = theRequestParameters.get(paramName);
+ if (params != null) {
+ for (String nextValue : params) {
+ if (isNotBlank(nextValue)) {
+ b.append('&');
+ b.append(paramName);
+ b.append('=');
+ b.append(UrlUtil.escape(nextValue));
+ }
+ }
+ }
+
return b.toString();
} catch (UnsupportedEncodingException e) {
throw new Error("UTF-8 not supported", e);// should not happen
@@ -580,10 +625,19 @@ public class RestfulServerUtils {
} else {
contentType = Constants.CT_OCTET_STREAM;
}
+
// Force binary resources to download - This is a security measure to prevent
// malicious images or HTML blocks being served up as content.
response.addHeader(Constants.HEADER_CONTENT_DISPOSITION, "Attachment;");
+ IBaseReference securityContext = BinaryUtil.getSecurityContext(theServer.getFhirContext(), bin);
+ if (securityContext != null) {
+ String securityContextRef = securityContext.getReferenceElement().getValue();
+ if (isNotBlank(securityContextRef)) {
+ response.addHeader(Constants.HEADER_X_SECURITY_CONTEXT, securityContextRef);
+ }
+ }
+
return response.sendAttachmentResponse(bin, theStausCode, contentType);
}
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CorsInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CorsInterceptor.java
index 795c066e328..38f7307b3bb 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CorsInterceptor.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CorsInterceptor.java
@@ -21,10 +21,13 @@ package ca.uhn.fhir.rest.server.interceptor;
*/
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import ca.uhn.fhir.rest.api.Constants;
import org.apache.commons.lang3.Validate;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsProcessor;
@@ -43,14 +46,16 @@ public class CorsInterceptor extends InterceptorAdapter {
* a FHIR server. This includes:
*
*