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

wip

This commit is contained in:
Tadgh 2021-03-23 19:29:22 -04:00
parent 8a8eb84fe6
commit 6f669f9ccd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderCustomSearchParamR4Test.java
View File

@ -451,7 +451,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
myClient
.search()
.forResource(ExplanationOfBenefit.class)
.where(new StringClientParam("created").matchesExactly().value("01-01-2020"))
.where(new StringClientParam("created").matches().value("01-01-2020"))
.returnBundle(Bundle.class)
.execute();
@ -464,7 +464,7 @@ public class ResourceProviderCustomSearchParamR4Test extends BaseResourceProvide
myClient
.search()
.forResource(ExplanationOfBenefit.class)
.where(new StringClientParam("service-date").matchesExactly().value("01-01-2020"))
.where(new StringClientParam("service-date").matches().value("01-01-2020"))
.returnBundle(Bundle.class)
.execute();

5
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java
View File

@ -107,7 +107,10 @@ public class ExceptionHandlingInterceptor {
@Hook(Pointcut.SERVER_PRE_PROCESS_OUTGOING_EXCEPTION)
public BaseServerResponseException preProcessOutgoingException(RequestDetails theRequestDetails, Throwable theException, HttpServletRequest theServletRequest) throws ServletException {
BaseServerResponseException retVal;
if (theException instanceof DataFormatException) {
//TODO GGG this is _not_ the fix.
if (theException instanceof InternalErrorException && theException.getCause().getCause() instanceof DataFormatException) {
retVal = new InvalidRequestException(theException.getCause().getCause());
} else if (theException instanceof DataFormatException) {
// Wrapping the DataFormatException as an InvalidRequestException so that it gets sent back to the client as a 400 response.
retVal = new InvalidRequestException(theException);
} else if (!(theException instanceof BaseServerResponseException)) {