Merge d42546b24b
into fb7571185a
This commit is contained in:
commit
3919c90b29
|
@ -24,8 +24,6 @@ import ca.uhn.fhir.model.api.IQueryParameterType;
|
||||||
import ca.uhn.fhir.rest.api.Constants;
|
import ca.uhn.fhir.rest.api.Constants;
|
||||||
import ca.uhn.fhir.rest.param.HasAndListParam;
|
import ca.uhn.fhir.rest.param.HasAndListParam;
|
||||||
import ca.uhn.fhir.rest.param.HasParam;
|
import ca.uhn.fhir.rest.param.HasParam;
|
||||||
import ca.uhn.fhir.rest.param.StringAndListParam;
|
|
||||||
import ca.uhn.fhir.rest.param.StringParam;
|
|
||||||
import ca.uhn.fhir.rest.param.TokenAndListParam;
|
import ca.uhn.fhir.rest.param.TokenAndListParam;
|
||||||
import ca.uhn.fhir.rest.param.TokenParam;
|
import ca.uhn.fhir.rest.param.TokenParam;
|
||||||
import ca.uhn.fhir.rest.param.UriAndListParam;
|
import ca.uhn.fhir.rest.param.UriAndListParam;
|
||||||
|
@ -49,8 +47,8 @@ public class ResourceMetaParams {
|
||||||
static {
|
static {
|
||||||
Map<String, Class<? extends IQueryParameterType>> resourceMetaParams = new HashMap<>();
|
Map<String, Class<? extends IQueryParameterType>> resourceMetaParams = new HashMap<>();
|
||||||
Map<String, Class<? extends IQueryParameterAnd<?>>> resourceMetaAndParams = new HashMap<>();
|
Map<String, Class<? extends IQueryParameterAnd<?>>> resourceMetaAndParams = new HashMap<>();
|
||||||
resourceMetaParams.put(IAnyResource.SP_RES_ID, StringParam.class);
|
resourceMetaParams.put(IAnyResource.SP_RES_ID, TokenParam.class);
|
||||||
resourceMetaAndParams.put(IAnyResource.SP_RES_ID, StringAndListParam.class);
|
resourceMetaAndParams.put(IAnyResource.SP_RES_ID, TokenAndListParam.class);
|
||||||
resourceMetaParams.put(Constants.PARAM_PID, TokenParam.class);
|
resourceMetaParams.put(Constants.PARAM_PID, TokenParam.class);
|
||||||
resourceMetaAndParams.put(Constants.PARAM_PID, TokenAndListParam.class);
|
resourceMetaAndParams.put(Constants.PARAM_PID, TokenAndListParam.class);
|
||||||
resourceMetaParams.put(Constants.PARAM_TAG, TokenParam.class);
|
resourceMetaParams.put(Constants.PARAM_TAG, TokenParam.class);
|
||||||
|
|
|
@ -42,7 +42,6 @@ import ca.uhn.fhir.rest.api.server.RequestDetails;
|
||||||
import ca.uhn.fhir.rest.param.BaseParamWithPrefix;
|
import ca.uhn.fhir.rest.param.BaseParamWithPrefix;
|
||||||
import ca.uhn.fhir.rest.param.ParamPrefixEnum;
|
import ca.uhn.fhir.rest.param.ParamPrefixEnum;
|
||||||
import ca.uhn.fhir.rest.param.ReferenceParam;
|
import ca.uhn.fhir.rest.param.ReferenceParam;
|
||||||
import ca.uhn.fhir.rest.param.StringParam;
|
|
||||||
import ca.uhn.fhir.rest.param.TokenParam;
|
import ca.uhn.fhir.rest.param.TokenParam;
|
||||||
import ca.uhn.fhir.rest.param.TokenParamModifier;
|
import ca.uhn.fhir.rest.param.TokenParamModifier;
|
||||||
import ca.uhn.fhir.rest.param.UriParam;
|
import ca.uhn.fhir.rest.param.UriParam;
|
||||||
|
@ -452,8 +451,8 @@ public class InMemoryResourceMatcher {
|
||||||
|
|
||||||
private boolean matchIdsOr(List<IQueryParameterType> theOrParams, IBaseResource theResource) {
|
private boolean matchIdsOr(List<IQueryParameterType> theOrParams, IBaseResource theResource) {
|
||||||
return theOrParams.stream()
|
return theOrParams.stream()
|
||||||
.anyMatch(param -> param instanceof StringParam
|
.anyMatch(param -> param instanceof TokenParam
|
||||||
&& matchId(((StringParam) param).getValue(), theResource.getIdElement()));
|
&& matchId(((TokenParam) param).getValue(), theResource.getIdElement()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean matchId(String theValue, IIdType theId) {
|
private boolean matchId(String theValue, IIdType theId) {
|
||||||
|
|
Loading…
Reference in New Issue