refactor createConsoleSessionResponse method

Author: bernardodemarco

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -5553,45 +5553,83 @@ public void updateTemplateIsoResponsesForIcons(List<TemplateResponse> responses,
         }
     }
 
-    @Override
-    public ConsoleSessionResponse createConsoleSessionResponse(ConsoleSession consoleSession, ResponseView responseView) {
-        ConsoleSessionResponse consoleSessionResponse = new ConsoleSessionResponse();
-        consoleSessionResponse.setId(consoleSession.getUuid());
-        consoleSessionResponse.setCreated(consoleSession.getCreated());
-        consoleSessionResponse.setAcquired(consoleSession.getAcquired());
-        consoleSessionResponse.setRemoved(consoleSession.getRemoved());
-        consoleSessionResponse.setConsoleEndpointCreatorAddress(consoleSession.getConsoleEndpointCreatorAddress());
-        consoleSessionResponse.setClientAddress(consoleSession.getClientAddress());
+    private void populateDomainFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
+        if (consoleSession == null) {
+            return;
+        }
 
         Domain domain = ApiDBUtils.findDomainById(consoleSession.getDomainId());
         if (domain != null) {
             consoleSessionResponse.setDomain(domain.getName());
             consoleSessionResponse.setDomainPath(domain.getPath());
             consoleSessionResponse.setDomainId(domain.getUuid());
         }
+    }
+
+    private void populateUserFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
+        if (consoleSession == null) {
+            return;
+        }
 
         User user = findUserById(consoleSession.getUserId());
         if (user != null) {
             consoleSessionResponse.setUser(user.getUsername());
             consoleSessionResponse.setUserId(user.getUuid());
         }
+    }
+
+    private void populateAccountFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
+        if (consoleSession == null) {
+            return;
+        }
 
         Account account = ApiDBUtils.findAccountById(consoleSession.getAccountId());
         if (account != null) {
             consoleSessionResponse.setAccount(account.getAccountName());
             consoleSessionResponse.setAccountId(account.getUuid());
         }
+    }
+
+    private void populateHostFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
+        if (consoleSession == null) {
+            return;
+        }
 
         Host host = findHostById(consoleSession.getHostId());
-        if (responseView == ResponseView.Full && host != null) {
+        if (host != null) {
             consoleSessionResponse.setHostId(host.getUuid());
             consoleSessionResponse.setHostName(host.getName());
         }
+    }
+
+    private void populateInstanceFieldsOnConsoleSessionResponse(ConsoleSession consoleSession, ConsoleSessionResponse consoleSessionResponse) {
+        if (consoleSession == null) {
+            return;
+        }
 
         VMInstanceVO instance = ApiDBUtils.findVMInstanceById(consoleSession.getInstanceId());
         if (instance != null) {
             consoleSessionResponse.setInstanceId(instance.getUuid());
         }
+    }
+
+    @Override
+    public ConsoleSessionResponse createConsoleSessionResponse(ConsoleSession consoleSession, ResponseView responseView) {
+        ConsoleSessionResponse consoleSessionResponse = new ConsoleSessionResponse();
+        consoleSessionResponse.setId(consoleSession.getUuid());
+        consoleSessionResponse.setCreated(consoleSession.getCreated());
+        consoleSessionResponse.setAcquired(consoleSession.getAcquired());
+        consoleSessionResponse.setRemoved(consoleSession.getRemoved());
+        consoleSessionResponse.setConsoleEndpointCreatorAddress(consoleSession.getConsoleEndpointCreatorAddress());
+        consoleSessionResponse.setClientAddress(consoleSession.getClientAddress());
+
+        populateDomainFieldsOnConsoleSessionResponse(consoleSession, consoleSessionResponse);
+        populateUserFieldsOnConsoleSessionResponse(consoleSession, consoleSessionResponse);
+        populateAccountFieldsOnConsoleSessionResponse(consoleSession, consoleSessionResponse);
+        populateInstanceFieldsOnConsoleSessionResponse(consoleSession, consoleSessionResponse);
+        if (responseView == ResponseView.Full) {
+            populateHostFieldsOnConsoleSessionResponse(consoleSession, consoleSessionResponse);
+        }
 
         consoleSessionResponse.setObjectName("consolesession");
         return consoleSessionResponse;