issue #3265 - checkType throws instead of logging for abstract types

Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
LinuxForHealth · Apr 8, 2022 · 4f23fa2 · 4f23fa2
1 parent 3fe5394
commit 4f23fa2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/fhir-server-test/src/test/java/com/ibm/fhir/server/test/operation/ReindexOperationTest.java b/fhir-server-test/src/test/java/com/ibm/fhir/server/test/operation/ReindexOperationTest.java
@@ -142,7 +142,7 @@ public void testReindexWithInvalidType() {
                 .header("X-FHIR-DSID", "default")
                 .post(entity, Response.class);
 
-        assertEquals(r.getStatus(), Status.BAD_REQUEST.getStatusCode());
+        assertEquals(r.getStatus(), Status.NOT_FOUND.getStatusCode());
     }
 
     @Test(groups = { "reindex" })

diff --git a/...ver-test/src/test/java/com/ibm/fhir/server/test/operation/RetrieveIndexOperationTest.java b/...ver-test/src/test/java/com/ibm/fhir/server/test/operation/RetrieveIndexOperationTest.java
@@ -156,6 +156,6 @@ public void testRetrieveIndex_invalidType() {
                 .header("X-FHIR-DSID", "default")
                 .post(entity, Response.class);
 
-        assertEquals(r.getStatus(), Status.BAD_REQUEST.getStatusCode());
+        assertEquals(r.getStatus(), Status.NOT_FOUND.getStatusCode());
     }
 }
diff --git a/fhir-server/src/main/java/com/ibm/fhir/server/resources/FHIRResource.java b/fhir-server/src/main/java/com/ibm/fhir/server/resources/FHIRResource.java
@@ -136,11 +136,8 @@ protected void checkInitComplete() throws FHIROperationException {
      * we'll throw an error to short-circuit the current in-progress REST API invocation.
      */
     protected void checkType(String type) throws FHIROperationException {
-        if (!ModelSupport.isResourceType(type)) {
-            throw buildUnsupportedResourceTypeException(type);
-        }
         if (!ModelSupport.isConcreteResourceType(type)) {
-            log.warning("Use of abstract resource types like '" + type + "' in FHIR URLs is deprecated and will be removed in a future release");
+            throw buildUnsupportedResourceTypeException(type);
         }
     }