Merge pull request #3736 from IBM/issue-3735

issue #3735 - remove invoke(String,String,Resource) special processing

Author: lmsurpre

fhir-server/pom.xml

@@ -65,6 +65,11 @@
             <artifactId>fhir-server-spi</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>fhir-profile</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>fhir-validation</artifactId>

fhir-server/src/main/java/com/ibm/fhir/server/resources/FHIRResource.java

@@ -336,7 +336,8 @@ protected Response exceptionResponse(FHIROperationException e, Status status) {
         if (status.getFamily() == Status.Family.SERVER_ERROR) {
             log.log(Level.SEVERE, e.getMessage(), e);
         } else if (log.isLoggable(Level.FINE)) {
-            log.log(Level.FINE, e.getMessage(), e);
+            // purposefully logged at level INFO because otherwise liberty suppresses the stacktrace
+            log.log(Level.INFO, e.getMessage(), e);
         } else if (log.isLoggable(Level.INFO)) {
             log.log(Level.INFO, e.getMessage());
         }

fhir-server/src/main/java/com/ibm/fhir/server/resources/Operation.java

@@ -264,21 +264,8 @@ public Response invoke(@PathParam("resourceTypeName") String resourceTypeName,
             status = Response.Status.fromStatusCode(response.getStatus());
             return response;
         } catch (FHIROperationException e) {
-            // response 200 OK if no failure issue found.
-            boolean isFailure = false;
-            for (Issue issue : e.getIssues()) {
-                if (FHIRUtil.isFailure(issue.getSeverity())) {
-                    isFailure = true;
-                    break;
-                }
-            }
-            if (isFailure) {
-                status = issueListToStatus(e.getIssues());
-                return exceptionResponse(e, status);
-            } else {
-                status = Status.OK;
-                return exceptionResponse(e, Response.Status.OK);
-            }
+            status = issueListToStatus(e.getIssues());
+            return exceptionResponse(e, status);
         } catch (Exception e) {
             status = Status.INTERNAL_SERVER_ERROR;
             return exceptionResponse(e, status);