Smaller methods

Author: harikrishna-patnala

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteStoragePoolCommandWrapper.java

@@ -41,45 +41,58 @@ public final class LibvirtDeleteStoragePoolCommandWrapper extends CommandWrapper
     @Override
     public Answer execute(final DeleteStoragePoolCommand command, final LibvirtComputingResource libvirtComputingResource) {
         try {
-            // if getRemoveDatastore() is true, then we are dealing with managed storage and can skip the delete logic here
             if (!command.getRemoveDatastore()) {
-                final StorageFilerTO pool = command.getPool();
-                final KVMStoragePoolManager storagePoolMgr = libvirtComputingResource.getStoragePoolMgr();
+                handleStoragePoolDeletion(command, libvirtComputingResource);
+            }
+            return new Answer(command);
+        } catch (final CloudRuntimeException e) {
+            return new Answer(command, false, e.toString());
+        }
+    }
 
-                storagePoolMgr.deleteStoragePool(pool.getType(), pool.getUuid());
-                if (Storage.StoragePoolType.Filesystem.equals(pool.getType()) && !libvirtComputingResource.DEFAULT_LOCAL_STORAGE_PATH.equals(pool.getPath())) {
-                    String localStoragePath = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.LOCAL_STORAGE_PATH);
-                    String localStorageUuid = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.LOCAL_STORAGE_UUID);
+    private void handleStoragePoolDeletion(final DeleteStoragePoolCommand command, final LibvirtComputingResource libvirtComputingResource) {
+        final StorageFilerTO pool = command.getPool();
+        final KVMStoragePoolManager storagePoolMgr = libvirtComputingResource.getStoragePoolMgr();
+        storagePoolMgr.deleteStoragePool(pool.getType(), pool.getUuid());
 
-                    String uuidToRemove = pool.getUuid();
-                    String pathToRemove = pool.getPath();
+        if (isLocalStorageAndNotHavingDefaultPath(pool, libvirtComputingResource)) {
+            updateLocalStorageProperties(pool);
+        }
+    }
 
-                    if (localStorageUuid != null && uuidToRemove != null) {
-                        localStorageUuid = Arrays.stream(localStorageUuid.split(","))
-                                .filter(uuid -> !uuid.equals(uuidToRemove))
-                                .collect(Collectors.joining(","));
-                    }
+    private boolean isLocalStorageAndNotHavingDefaultPath(final StorageFilerTO pool, final LibvirtComputingResource libvirtComputingResource) {
+        return Storage.StoragePoolType.Filesystem.equals(pool.getType())
+                && !libvirtComputingResource.DEFAULT_LOCAL_STORAGE_PATH.equals(pool.getPath());
+    }
 
-                    if (localStoragePath != null && pathToRemove != null) {
-                        localStoragePath = Arrays.stream(localStoragePath.split(","))
-                                .filter(path -> !path.equals(pathToRemove))
-                                .collect(Collectors.joining(","));
-                    }
+    private void updateLocalStorageProperties(final StorageFilerTO pool) {
+        String localStoragePath = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.LOCAL_STORAGE_PATH);
+        String localStorageUuid = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.LOCAL_STORAGE_UUID);
 
-                    PropertiesStorage agentProperties = new PropertiesStorage();
-                    agentProperties.configure("AgentProperties", new HashMap<String, Object>());
-                    if (localStorageUuid != null) {
-                        agentProperties.persist(AgentProperties.LOCAL_STORAGE_UUID.getName(), localStorageUuid);
-                    }
-                    if (localStoragePath != null) {
-                        agentProperties.persist(AgentProperties.LOCAL_STORAGE_PATH.getName(), localStoragePath);
-                    }
-                }
-            }
+        String uuidToRemove = pool.getUuid();
+        String pathToRemove = pool.getPath();
 
-            return new Answer(command);
-        } catch (final CloudRuntimeException e) {
-            return new Answer(command, false, e.toString());
+        if (localStorageUuid != null && uuidToRemove != null) {
+            localStorageUuid = Arrays.stream(localStorageUuid.split(","))
+                    .filter(uuid -> !uuid.equals(uuidToRemove))
+                    .collect(Collectors.joining(","));
+        }
+
+        if (localStoragePath != null && pathToRemove != null) {
+            localStoragePath = Arrays.stream(localStoragePath.split(","))
+                    .filter(path -> !path.equals(pathToRemove))
+                    .collect(Collectors.joining(","));
+        }
+
+        PropertiesStorage agentProperties = new PropertiesStorage();
+        agentProperties.configure("AgentProperties", new HashMap<String, Object>());
+
+        if (localStorageUuid != null) {
+            agentProperties.persist(AgentProperties.LOCAL_STORAGE_UUID.getName(), localStorageUuid);
+        }
+
+        if (localStoragePath != null) {
+            agentProperties.persist(AgentProperties.LOCAL_STORAGE_PATH.getName(), localStoragePath);
         }
     }
 }