From 126c16a36a534cb2879eafc2c3c6d142556a7e68 Mon Sep 17 00:00:00 2001
From: Ruslan Forostianov <ruslan@se4.bio>
Date: Thu, 20 Jun 2024 17:31:07 +0200
Subject: [PATCH] Fix sonar reported NPE bugs

---
 .../web/PublicVirtualStudiesController.java         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/cbioportal/web/PublicVirtualStudiesController.java b/src/main/java/org/cbioportal/web/PublicVirtualStudiesController.java
index 04caf520aee..efc8bf19b28 100644
--- a/src/main/java/org/cbioportal/web/PublicVirtualStudiesController.java
+++ b/src/main/java/org/cbioportal/web/PublicVirtualStudiesController.java
@@ -136,19 +136,20 @@ public ResponseEntity<VirtualStudy> publishVirtualStudy(
         }
         ResponseEntity<VirtualStudy> responseEntity = getVirtualStudyById(id);
         HttpStatusCode statusCode = responseEntity.getStatusCode();
+        VirtualStudy virtualStudy = responseEntity.getBody();
         if (!statusCode.is2xxSuccessful()) {
             LOG.error("The downstream server replied with statusCode={} and body={}." +
                     " Replying with the same status code to the client.",
-                statusCode, responseEntity.getBody());
+                statusCode, virtualStudy);
             return new ResponseEntity<>(null, statusCode);
         }
-        if (responseEntity.getBody() == null) {
+        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);
         }
-        return publishVirtualStudyData(responseEntity.getBody().getData(), providedPublisherApiKey, typeOfCancerId, pmid);
+        return publishVirtualStudyData(virtualStudy.getData(), providedPublisherApiKey, typeOfCancerId, pmid);
     }
 
     private ResponseEntity<VirtualStudy> getVirtualStudyById(String id) {
@@ -173,19 +174,19 @@ public ResponseEntity retractVirtualStudy(
         }
         ResponseEntity<VirtualStudy> responseEntity = getVirtualStudyById(id);
         HttpStatusCode statusCode = responseEntity.getStatusCode();
+        VirtualStudy virtualStudy = responseEntity.getBody();
         if (!statusCode.is2xxSuccessful()) {
             LOG.error("The downstream server replied with statusCode={} and body={}." +
                     " Replying with the same status code to the client.",
-                statusCode, responseEntity.getBody());
+                statusCode, virtualStudy);
             return new ResponseEntity<>(null, statusCode);
         }
-        if (responseEntity.getBody() == null) {
+        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);
         }
-        VirtualStudy virtualStudy = responseEntity.getBody();
         VirtualStudyData data = virtualStudy.getData();
         data.setUsers(Collections.emptySet());
         new RestTemplate()