Throw IllegalStateException is downstream server return unsuccessful …

…result
cBioPortal · Jun 26, 2024 · a5445c0 · a5445c0
1 parent c27cf33
commit a5445c0
Showing 1 changed file with 4 additions and 16 deletions.
diff --git a/src/main/java/org/cbioportal/web/PublicVirtualStudiesController.java b/src/main/java/org/cbioportal/web/PublicVirtualStudiesController.java
@@ -136,17 +136,11 @@ public ResponseEntity<VirtualStudy> publishVirtualStudy(
         ResponseEntity<VirtualStudy> responseEntity = getVirtualStudyById(id);
         HttpStatusCode statusCode = responseEntity.getStatusCode();
         VirtualStudy virtualStudy = responseEntity.getBody();
-        if (!statusCode.is2xxSuccessful()) {
+        if (!statusCode.is2xxSuccessful() || virtualStudy == null) {
             LOG.error("The downstream server replied with statusCode={} and body={}." +
                     " Replying with the same status code to the client.",
                 statusCode, virtualStudy);
-            return new ResponseEntity<>(null, statusCode);
-        }
-        if (virtualStudy == null) {
-            LOG.error("The downstream server replied without body and statusCode={}." +
-                    " Replying with internal server error status code to the client.",
-                statusCode);
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
+            throw new IllegalStateException("The downstream server response is not successful");
         }
         return publishVirtualStudyData(virtualStudy.getData(), providedPublisherApiKey, typeOfCancerId, pmid);
     }
@@ -172,17 +166,11 @@ public ResponseEntity retractVirtualStudy(
         ResponseEntity<VirtualStudy> responseEntity = getVirtualStudyById(id);
         HttpStatusCode statusCode = responseEntity.getStatusCode();
         VirtualStudy virtualStudy = responseEntity.getBody();
-        if (!statusCode.is2xxSuccessful()) {
+        if (!statusCode.is2xxSuccessful() || virtualStudy == null) {
             LOG.error("The downstream server replied with statusCode={} and body={}." +
                     " Replying with the same status code to the client.",
                 statusCode, virtualStudy);
-            return new ResponseEntity<>(null, statusCode);
-        }
-        if (virtualStudy == null) {
-            LOG.error("The downstream server replied without body and statusCode={}." +
-                    " Replying with internal server error status code to the client.",
-                statusCode);
-            return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
+            throw new IllegalStateException("The downstream server response is not successful");
         }
         VirtualStudyData data = virtualStudy.getData();
         data.setUsers(Collections.emptySet());