diff options
author | 2019-11-06 16:22:45 +0530 | |
---|---|---|
committer | 2019-11-06 16:23:09 +0530 | |
commit | fedaea3c645ac54a7fe68d2aece2259adb96d6d4 (patch) | |
tree | 1345e42c84bf247c76f272c64a01338657320b83 /vid-app-common | |
parent | b84d6332c492206cecf11d54a884c8a299ef1690 (diff) |
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>
Diffstat (limited to 'vid-app-common')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java | 4 |
1 files changed, 1 insertions, 3 deletions
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 1c8a465cb..45478e20f 100644 --- 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))); |