honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseValidationSupportWrapper.expandValueSet(...) and ValidationSupportChain.expandValueSet(...) were incorrectly replacing expansion options (i.e. offset and count) with null.

This commit is contained in:
Diederik Muylwyk 2020-06-22 16:52:52 -04:00
parent 46c00f4efb
commit 314df43091
3 changed files with 363 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

362
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5ValueSetTest.java
View File

@ -301,6 +301,122 @@ public class ResourceProviderR5ValueSetTest extends BaseResourceProviderR5Test {
}
@Test
public void testExpandByIdWithPreExpansionWithOffset() throws Exception {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
Parameters respParam = ourClient
.operation()
.onInstance(myExtensionalVsId)
.named("expand")
.withParameter(Parameters.class, "offset", new IntegerType(1))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
assertThat(resp, stringContainsInOrder(
"<total value=\"24\"/>\n",
"<offset value=\"1\"/>\n",
"<parameter>\n",
"<name value=\"offset\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<parameter>\n",
"<name value=\"count\"/>\n",
"<valueInteger value=\"1000\"/>\n",
"</parameter>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"11378-7\"/>\n",
"<display value=\"Systolic blood pressure at First encounter\"/>\n",
"</contains>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"8493-9\"/>\n",
"<display value=\"Systolic blood pressure 10 hour minimum\"/>\n",
"</contains>"));
}
@Test
public void testExpandByIdWithPreExpansionWithCount() throws Exception {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
Parameters respParam = ourClient
.operation()
.onInstance(myExtensionalVsId)
.named("expand")
.withParameter(Parameters.class, "count", new IntegerType(1))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
assertThat(resp, stringContainsInOrder(
"<total value=\"24\"/>\n",
"<offset value=\"0\"/>\n",
"<parameter>\n",
"<name value=\"offset\"/>\n",
"<valueInteger value=\"0\"/>\n",
"</parameter>\n",
"<parameter>\n",
"<name value=\"count\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"8450-9\"/>\n",
"<display value=\"Systolic blood pressure--expiration\"/>\n",
"</contains>\n",
"</expansion>"));
}
@Test
public void testExpandByIdWithPreExpansionWithOffsetAndCount() throws Exception {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
Parameters respParam = ourClient
.operation()
.onInstance(myExtensionalVsId)
.named("expand")
.withParameter(Parameters.class, "offset", new IntegerType(1))
.andParameter("count", new IntegerType(1))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
assertThat(resp, stringContainsInOrder(
"<total value=\"24\"/>\n",
"<offset value=\"1\"/>\n",
"<parameter>\n",
"<name value=\"offset\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<parameter>\n",
"<name value=\"count\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"11378-7\"/>\n",
"<display value=\"Systolic blood pressure at First encounter\"/>\n",
"</contains>\n",
"</expansion>"));
}
@Test
public void testExpandByIdWithFilter() throws Exception {
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
@ -402,6 +518,125 @@ public class ResourceProviderR5ValueSetTest extends BaseResourceProviderR5Test {
}
@Test
public void testExpandByUrlWithPreExpansionWithOffset() throws Exception {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
Parameters respParam = ourClient
.operation()
.onType(ValueSet.class)
.named("expand")
.withParameter(Parameters.class, "url", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
.andParameter("offset", new IntegerType(1))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
assertThat(resp, stringContainsInOrder(
"<total value=\"24\"/>\n",
"<offset value=\"1\"/>\n",
"<parameter>\n",
"<name value=\"offset\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<parameter>\n",
"<name value=\"count\"/>\n",
"<valueInteger value=\"1000\"/>\n",
"</parameter>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"11378-7\"/>\n",
"<display value=\"Systolic blood pressure at First encounter\"/>\n",
"</contains>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"8493-9\"/>\n",
"<display value=\"Systolic blood pressure 10 hour minimum\"/>\n",
"</contains>"));
}
@Test
public void testExpandByUrlWithPreExpansionWithCount() throws Exception {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
Parameters respParam = ourClient
.operation()
.onType(ValueSet.class)
.named("expand")
.withParameter(Parameters.class, "url", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
.andParameter("count", new IntegerType(1))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
assertThat(resp, stringContainsInOrder(
"<total value=\"24\"/>\n",
"<offset value=\"0\"/>\n",
"<parameter>\n",
"<name value=\"offset\"/>\n",
"<valueInteger value=\"0\"/>\n",
"</parameter>\n",
"<parameter>\n",
"<name value=\"count\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"8450-9\"/>\n",
"<display value=\"Systolic blood pressure--expiration\"/>\n",
"</contains>\n",
"</expansion>"));
}
@Test
public void testExpandByUrlWithPreExpansionWithOffsetAndCount() throws Exception {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
Parameters respParam = ourClient
.operation()
.onType(ValueSet.class)
.named("expand")
.withParameter(Parameters.class, "url", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
.andParameter("offset", new IntegerType(1))
.andParameter("count", new IntegerType(1))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
assertThat(resp, stringContainsInOrder(
"<total value=\"24\"/>\n",
"<offset value=\"1\"/>\n",
"<parameter>\n",
"<name value=\"offset\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<parameter>\n",
"<name value=\"count\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"11378-7\"/>\n",
"<display value=\"Systolic blood pressure at First encounter\"/>\n",
"</contains>\n",
"</expansion>"));
}
@Test
public void testExpandByUrlWithPreExpansionAndBogusUrl() throws Exception {
myDaoConfig.setPreExpandValueSets(true);
@ -448,7 +683,7 @@ public class ResourceProviderR5ValueSetTest extends BaseResourceProviderR5Test {
public void testExpandByValueSetWithPreExpansion() throws IOException {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystem(HTTPVerb.POST);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-3-vs.xml");
@ -469,6 +704,131 @@ public class ResourceProviderR5ValueSetTest extends BaseResourceProviderR5Test {
}
@Test
public void testExpandByValueSetWithPreExpansionWithOffset() throws IOException {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-3-vs.xml");
Parameters respParam = ourClient
.operation()
.onType(ValueSet.class)
.named("expand")
.withParameter(Parameters.class, "valueSet", toExpand)
.andParameter("offset", new IntegerType(1))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
assertThat(resp, stringContainsInOrder(
"<total value=\"24\"/>\n",
"<offset value=\"1\"/>\n",
"<parameter>\n",
"<name value=\"offset\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<parameter>\n",
"<name value=\"count\"/>\n",
"<valueInteger value=\"1000\"/>\n",
"</parameter>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"11378-7\"/>\n",
"<display value=\"Systolic blood pressure at First encounter\"/>\n",
"</contains>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"8493-9\"/>\n",
"<display value=\"Systolic blood pressure 10 hour minimum\"/>\n",
"</contains>"));
}
@Test
public void testExpandByValueSetWithPreExpansionWithCount() throws IOException {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-3-vs.xml");
Parameters respParam = ourClient
.operation()
.onType(ValueSet.class)
.named("expand")
.withParameter(Parameters.class, "valueSet", toExpand)
.andParameter("count", new IntegerType(1))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
assertThat(resp, stringContainsInOrder(
"<total value=\"24\"/>\n",
"<offset value=\"0\"/>\n",
"<parameter>\n",
"<name value=\"offset\"/>\n",
"<valueInteger value=\"0\"/>\n",
"</parameter>\n",
"<parameter>\n",
"<name value=\"count\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"8450-9\"/>\n",
"<display value=\"Systolic blood pressure--expiration\"/>\n",
"</contains>\n",
"</expansion>"));
}
@Test
public void testExpandByValueSetWithPreExpansionWithOffsetAndCount() throws IOException {
myDaoConfig.setPreExpandValueSets(true);
loadAndPersistCodeSystemAndValueSet(HTTPVerb.POST);
myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-3-vs.xml");
Parameters respParam = ourClient
.operation()
.onType(ValueSet.class)
.named("expand")
.withParameter(Parameters.class, "valueSet", toExpand)
.andParameter("offset", new IntegerType(1))
.andParameter("count", new IntegerType(1))
.execute();
ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
ourLog.info(resp);
assertThat(resp, stringContainsInOrder(
"<total value=\"24\"/>\n",
"<offset value=\"1\"/>\n",
"<parameter>\n",
"<name value=\"offset\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<parameter>\n",
"<name value=\"count\"/>\n",
"<valueInteger value=\"1\"/>\n",
"</parameter>\n",
"<contains>\n",
"<system value=\"http://acme.org\"/>\n",
"<code value=\"11378-7\"/>\n",
"<display value=\"Systolic blood pressure at First encounter\"/>\n",
"</contains>\n",
"</expansion>"));
}
@Test
public void testExpandInlineVsAgainstBuiltInCs() {
createLocalVsPointingAtBuiltInCodeSystem();

2
hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/BaseValidationSupportWrapper.java
View File

@ -70,7 +70,7 @@ public class BaseValidationSupportWrapper extends BaseValidationSupport {
@Override
public IValidationSupport.ValueSetExpansionOutcome expandValueSet(ValidationSupportContext theValidationSupportContext, ValueSetExpansionOptions theExpansionOptions, IBaseResource theValueSetToExpand) {
return myWrap.expandValueSet(theValidationSupportContext, null, theValueSetToExpand);
return myWrap.expandValueSet(theValidationSupportContext, theExpansionOptions, theValueSetToExpand);
}
@Override

2
hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/ValidationSupportChain.java
View File

@ -134,7 +134,7 @@ public class ValidationSupportChain implements IValidationSupport {
public ValueSetExpansionOutcome expandValueSet(ValidationSupportContext theValidationSupportContext, ValueSetExpansionOptions theExpansionOptions, IBaseResource theValueSetToExpand) {
for (IValidationSupport next : myChain) {
// TODO: test if code system is supported?
ValueSetExpansionOutcome expanded = next.expandValueSet(theValidationSupportContext, null, theValueSetToExpand);
ValueSetExpansionOutcome expanded = next.expandValueSet(theValidationSupportContext, theExpansionOptions, theValueSetToExpand);
if (expanded != null) {
return expanded;
}