honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-02-17 02:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Credit and a unit test for #912

Browse Source
This commit is contained in:
jamesagnew 2018-07-30 05:48:38 -04:00
parent d50dda19ae
commit 0f1724ac0a
3 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java
View File

@ -20,12 +20,12 @@ package ca.uhn.fhir.rest.gclient;
* #L% * #L%
*/ */
import ca.uhn.fhir.rest.api.Constants;
import org.hl7.fhir.instance.model.api.IPrimitiveType;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import ca.uhn.fhir.model.primitive.StringDt;
import ca.uhn.fhir.rest.api.Constants;
/** /**
* *
* @author james * @author james
@ -83,7 +83,7 @@ public class StringClientParam extends BaseClientParam implements IParam {
/** /**
* Requests that resources be returned which match the given value * Requests that resources be returned which match the given value
*/ */
ICriterion<StringClientParam> value(StringDt theValue); ICriterion<StringClientParam> value(IPrimitiveType<String> theValue);
/** /**
* Requests that resources be returned which match ANY of the given values (this is an OR search, not an AND search). Note that to * Requests that resources be returned which match ANY of the given values (this is an OR search, not an AND search). Note that to
@ -97,17 +97,17 @@ public class StringClientParam extends BaseClientParam implements IParam {
private class StringExactly implements IStringMatch { private class StringExactly implements IStringMatch {
@Override @Override
public ICriterion<StringClientParam> value(String theValue) { public ICriterion<StringClientParam> value(String theValue) {
return new StringCriterion<StringClientParam>(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue); return new StringCriterion<>(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue);
} }
@Override @Override
public ICriterion<StringClientParam> value(StringDt theValue) { public ICriterion<StringClientParam> value(IPrimitiveType<String> theValue) {
return new StringCriterion<StringClientParam>(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue.getValue()); return new StringCriterion<>(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue.getValue());
} }
@Override @Override
public ICriterion<StringClientParam> values(List<String> theValue) { public ICriterion<StringClientParam> values(List<String> theValue) {
return new StringCriterion<StringClientParam>(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue); return new StringCriterion<>(getParamName() + Constants.PARAMQUALIFIER_STRING_EXACT, theValue);
} }
@Override @Override
@ -119,17 +119,17 @@ public class StringClientParam extends BaseClientParam implements IParam {
private class StringContains implements IStringMatch { private class StringContains implements IStringMatch {
@Override @Override
public ICriterion<StringClientParam> value(String theValue) { public ICriterion<StringClientParam> value(String theValue) {
return new StringCriterion<StringClientParam>(getParamName() + Constants.PARAMQUALIFIER_STRING_CONTAINS, theValue); return new StringCriterion<>(getParamName() + Constants.PARAMQUALIFIER_STRING_CONTAINS, theValue);
} }
@Override @Override
public ICriterion<StringClientParam> value(StringDt theValue) { public ICriterion<StringClientParam> value(IPrimitiveType<String> theValue) {
return new StringCriterion<StringClientParam>(getParamName() + Constants.PARAMQUALIFIER_STRING_CONTAINS, theValue.getValue()); return new StringCriterion<>(getParamName() + Constants.PARAMQUALIFIER_STRING_CONTAINS, theValue.getValue());
} }
@Override @Override
public ICriterion<StringClientParam> values(List<String> theValue) { public ICriterion<StringClientParam> values(List<String> theValue) {
return new StringCriterion<StringClientParam>(getParamName() + Constants.PARAMQUALIFIER_STRING_CONTAINS, theValue); return new StringCriterion<>(getParamName() + Constants.PARAMQUALIFIER_STRING_CONTAINS, theValue);
} }
@Override @Override
@ -141,17 +141,17 @@ public class StringClientParam extends BaseClientParam implements IParam {
private class StringMatches implements IStringMatch { private class StringMatches implements IStringMatch {
@Override @Override
public ICriterion<StringClientParam> value(String theValue) { public ICriterion<StringClientParam> value(String theValue) {
return new StringCriterion<StringClientParam>(getParamName(), theValue); return new StringCriterion<>(getParamName(), theValue);
} }
@Override @Override
public ICriterion<StringClientParam> value(StringDt theValue) { public ICriterion<StringClientParam> value(IPrimitiveType<String> theValue) {
return new StringCriterion<StringClientParam>(getParamName(), theValue.getValue()); return new StringCriterion<>(getParamName(), theValue.getValue());
} }
@Override @Override
public ICriterion<StringClientParam> values(List<String> theValue) { public ICriterion<StringClientParam> values(List<String> theValue) {
return new StringCriterion<StringClientParam>(getParamName(), theValue); return new StringCriterion<>(getParamName(), theValue);
} }
@Override @Override

44
hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java
View File

@ -43,6 +43,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.StringReader; import java.io.StringReader;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Arrays;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.startsWith; import static org.hamcrest.Matchers.startsWith;
@ -1059,6 +1060,49 @@ public class GenericClientTest {
} }
@SuppressWarnings("unused")
@Test
public void testSearchByStringContains() throws Exception {
String msg = getPatientFeedWithOneResult();
ArgumentCaptor<HttpUriRequest> capt = ArgumentCaptor.forClass(HttpUriRequest.class);
when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse);
when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK"));
when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8"));
when(myHttpResponse.getEntity().getContent()).thenAnswer(t-> new ReaderInputStream(new StringReader(msg), Charset.forName("UTF-8")));
IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir");
Bundle response = client.search()
.forResource("Patient")
.where(Patient.NAME.contains().value("FOO"))
.returnBundle(Bundle.class)
.execute();
assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO", capt.getValue().getURI().toString());
response = client.search()
.forResource("Patient")
.where(Patient.NAME.contains().values("FOO", "BAR"))
.returnBundle(Bundle.class)
.execute();
assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO%2CBAR", capt.getValue().getURI().toString());
response = client.search()
.forResource("Patient")
.where(Patient.NAME.contains().values(Arrays.asList("FOO", "BAR")))
.returnBundle(Bundle.class)
.execute();
assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO%2CBAR", capt.getValue().getURI().toString());
response = client.search()
.forResource("Patient")
.where(Patient.NAME.contains().value(new StringType("FOO")))
.returnBundle(Bundle.class)
.execute();
assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO", capt.getValue().getURI().toString());
}
@SuppressWarnings("unused") @SuppressWarnings("unused")
@Test @Test
public void testSearchByStringExact() throws Exception { public void testSearchByStringExact() throws Exception {

5
src/changes/changes.xml
View File

@ -150,6 +150,11 @@
in order to prevent HTML injection attacks via maliciously in order to prevent HTML injection attacks via maliciously
crafted URLs. crafted URLs.
</action> </action>
<action type="add" issue="912">
The generic/fluent client now supports the :contains modifier on
string search params. Thanks to Clayton Bodendein for the pull
request!
</action>
</release> </release>
<release version="3.4.0" date="2018-05-28"> <release version="3.4.0" date="2018-05-28">
<action type="add"> <action type="add">