Issue #1323 - Updates after code review

Signed-off-by: Troy Biesterfeld <tbieste@us.ibm.com>
LinuxForHealth · Mar 22, 2021 · b9db511 · b9db511
1 parent 6e1e5ae
commit b9db511
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/fhir-search/src/main/java/com/ibm/fhir/search/util/SearchUtil.java b/fhir-search/src/main/java/com/ibm/fhir/search/util/SearchUtil.java
@@ -1298,7 +1298,8 @@ private static List<QueryParameterValue> parseQueryParameterValuesString(SearchP
                     final String ofTypeParmName = searchParameter.getCode().getValue() + SearchConstants.OF_TYPE_MODIFIER_SUFFIX;
                     parameterValue.setOfTypeModifier(true);
                     if (parts.length < 2) {
-                        throw SearchExceptionUtil.buildNewInvalidSearchException("Search parameter '" + ofTypeParmName + "' requires at least a code and value");
+                        String msg = "Search parameter '" + searchParameter.getCode().getValue() + "' with modifier ':" + modifier + "' requires at least a code and value";
+                        throw SearchExceptionUtil.buildNewInvalidSearchException(msg);
                     } else if (parts.length < 4) {
                         QueryParameterValue typeParameterValue = new QueryParameterValue();
                         if (parts.length == 3) {

diff --git a/fhir-server-test/src/test/java/com/ibm/fhir/server/test/SearchTest.java b/fhir-server-test/src/test/java/com/ibm/fhir/server/test/SearchTest.java
@@ -502,7 +502,7 @@ public void testSearchPatientWithIdentifierOfTypeValueOnly() {
                 .get();
         assertResponse(response, Response.Status.BAD_REQUEST.getStatusCode());
         assertExceptionOperationOutcome(response.readEntity(OperationOutcome.class),
-                "Search parameter 'identifier:of-type' requires at least a code and value");
+                "Search parameter 'identifier' with modifier ':of-type' requires at least a code and value");
     }
 
     @Test(groups = { "server-search" }, dependsOnMethods = {"testCreatePatient" })