Merge this if statement with the enclosing one.

Merging collapsible if statements increases the code's readability.

Issue-ID: VID-699
Change-Id: Ia2b7408dd4ed73d57ead0fb4f2b404e74745b4ec
Signed-off-by: anushadasari <danush10@in.ibm.com>

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java b/vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java
index 1c8a465..45478e2 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java
@@ -360,12 +360,10 @@ public class ServiceModel {
                                " Associated VF Module customizationName=" + vfModuleComponent.getKey() + " with VNF customization name=" + vnfCustomizationName);
 
                // now find if this vf module has volume groups, if so, find the volume group with the same customization name and put it under the VNF
-               if ( vfModuleComponent.getValue().isVolumeGroupAllowed() ) {
-            if (isVolumeGroupsContainsVfModuleCustomName(vfModuleCustomizationName)) {
+               if ( vfModuleComponent.getValue().isVolumeGroupAllowed() && isVolumeGroupsContainsVfModuleCustomName(vfModuleCustomizationName) ) {
                        (vnfComponent.getValue().getVolumeGroups()).put(vfModuleCustomizationName, (getVolumeGroups()).get(vfModuleCustomizationName));
                }
        }
-       }
 
        private boolean isVolumeGroupsContainsVfModuleCustomName(String vfModuleCustomizationName) {
                return (!MapUtils.isEmpty(getVolumeGroups())) && (getVolumeGroups().containsKey((vfModuleCustomizationName)));