Merge pull request #572 from liimaorg/exruntime_nullpointer

add missing deployment exRuntime code
liimaorg · Sep 3, 2020 · 5dcc397 · 5dcc397
2 parents a178164 + 4dfd24b
commit 5dcc397
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/...ess/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundary.java b/...ess/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundary.java
@@ -335,6 +335,14 @@ public String getDeletedReleaseName(DeploymentEntity deployment) {
         return deployment.getRelease().getName();
     }
 
+    public String getDeletedRuntimeName(DeploymentEntity deployment) {
+        if (deployment.getRuntime() == null) {
+            ResourceEntity res = (ResourceEntity) auditService.getDeletedEntity(new ResourceEntity(), deployment.getExRuntimeResourceId());
+            return res.getName();
+        }
+        return deployment.getRuntime().getName();
+    }
+
     private void populateDeletedContextMap() {
         deletedContextNameIdMap = new HashMap<>();
         List<ContextEntity> allDeletedEnvironments = contextLocator.getAllDeletedEnvironments();

diff --git a/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentsRest.java b/AMW_rest/src/main/java/ch/mobi/itc/mobiliar/rest/deployments/DeploymentsRest.java
@@ -175,6 +175,9 @@ private DeploymentDTO createPreservedDeploymentDTO(DeploymentEntity deployment)
         if (deployment.getExReleaseId() != null) {
             properties.setReleaseName(deploymentBoundary.getDeletedReleaseName(deployment));
         }
+        if (deployment.getExRuntimeResourceId() != null) {
+            properties.setRuntimeName(deploymentBoundary.getDeletedRuntimeName(deployment));
+        }
         deploymentDTO.setPreservedValues(deployment, properties);
         deploymentDTO.setActions(new DeploymentActionsDTO());
         return deploymentDTO;