1 files changed, 66 insertions, 75 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ManualVspToscaManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ManualVspToscaManagerImpl.java
index 58cb2cf2d6..e7697aad35 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ManualVspToscaManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ManualVspToscaManagerImpl.java
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.vendorsoftwareproduct.impl;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import org.apache.commons.collections4.MapUtils;
 import org.openecomp.sdc.generator.core.services.ManualVspToscaGenerationService;
 import org.openecomp.sdc.generator.datatypes.tosca.DeploymentFlavorModel;
@@ -29,84 +31,73 @@ import org.openecomp.sdc.vendorsoftwareproduct.services.ManualVspDataCollectionS
 import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Nic;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 public class ManualVspToscaManagerImpl implements ManualVspToscaManager {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(ManualVspToscaManagerImpl.class);
-
-  private final ManualVspDataCollectionService
-      manualVspDataCollectionService = new ManualVspDataCollectionService();
-
-  @Override
-  public VspModelInfo gatherVspInformation(String vspId, Version version) {
-    VspModelInfo vspModelInfo = new VspModelInfo();
-    //Get Release Vendor Name
-    Optional<String> releaseVendor;
-    try {
-      releaseVendor = manualVspDataCollectionService.getReleaseVendor(vspId, version);
-    } catch (Exception ex) {
-      releaseVendor = Optional.empty();
-      LOGGER.error("Failed to get release vendor: {}", ex.getMessage(), ex);
-    }
-    releaseVendor.ifPresent(vspModelInfo::setReleaseVendor);
-
-    //Get Allowed Deployment flavors information
-    Map<String, DeploymentFlavorModel> allowedFlavors;
-    try {
-      allowedFlavors = manualVspDataCollectionService.getAllowedFlavors(vspId, version);
-    } catch (Exception ex) {
-      allowedFlavors = null;
-      LOGGER.error("Failed to get allowed flavours: {}", ex.getMessage(), ex);
-    }
-    if (MapUtils.isNotEmpty(allowedFlavors)) {
-      vspModelInfo.setAllowedFlavors(allowedFlavors);
-    }
-
-    //Get VFC Image information
-    Map<String, List<MultiFlavorVfcImage>> vspComponentImages;
-    try {
-      vspComponentImages =
-          manualVspDataCollectionService.getVspComponentImages(vspId, version);
-    } catch (Exception ex) {
-      vspComponentImages = null;
-      LOGGER.error("Failed to get VSP components Images: {}", ex.getMessage(), ex);
-    }
-    if (MapUtils.isNotEmpty(vspComponentImages)) {
-      vspModelInfo.setMultiFlavorVfcImages(vspComponentImages);
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(ManualVspToscaManagerImpl.class);
+    private final ManualVspDataCollectionService manualVspDataCollectionService = new ManualVspDataCollectionService();
 
-    //Get VFC component information
-    Map<String, String> vspComponents;
-    try {
-      vspComponents = manualVspDataCollectionService.getVspComponents(vspId, version);
-    } catch (Exception ex) {
-      vspComponents = null;
-      LOGGER.error("Failed to get VSP components: {}", ex.getMessage(), ex);
-    }
-    if (MapUtils.isNotEmpty(vspComponents)) {
-      vspModelInfo.setComponents(vspComponents);
+    @Override
+    public VspModelInfo gatherVspInformation(String vspId, Version version) {
+        VspModelInfo vspModelInfo = new VspModelInfo();
+        //Get Release Vendor Name
+        Optional<String> releaseVendor;
+        try {
+            releaseVendor = manualVspDataCollectionService.getReleaseVendor(vspId, version);
+        } catch (Exception ex) {
+            releaseVendor = Optional.empty();
+            LOGGER.error("Failed to get release vendor: {}", ex.getMessage(), ex);
+        }
+        releaseVendor.ifPresent(vspModelInfo::setReleaseVendor);
+        //Get Allowed Deployment flavors information
+        Map<String, DeploymentFlavorModel> allowedFlavors;
+        try {
+            allowedFlavors = manualVspDataCollectionService.getAllowedFlavors(vspId, version);
+        } catch (Exception ex) {
+            allowedFlavors = null;
+            LOGGER.error("Failed to get allowed flavours: {}", ex.getMessage(), ex);
+        }
+        if (MapUtils.isNotEmpty(allowedFlavors)) {
+            vspModelInfo.setAllowedFlavors(allowedFlavors);
+        }
+        //Get VFC Image information
+        Map<String, List<MultiFlavorVfcImage>> vspComponentImages;
+        try {
+            vspComponentImages = manualVspDataCollectionService.getVspComponentImages(vspId, version);
+        } catch (Exception ex) {
+            vspComponentImages = null;
+            LOGGER.error("Failed to get VSP components Images: {}", ex.getMessage(), ex);
+        }
+        if (MapUtils.isNotEmpty(vspComponentImages)) {
+            vspModelInfo.setMultiFlavorVfcImages(vspComponentImages);
+        }
+        //Get VFC component information
+        Map<String, String> vspComponents;
+        try {
+            vspComponents = manualVspDataCollectionService.getVspComponents(vspId, version);
+        } catch (Exception ex) {
+            vspComponents = null;
+            LOGGER.error("Failed to get VSP components: {}", ex.getMessage(), ex);
+        }
+        if (MapUtils.isNotEmpty(vspComponents)) {
+            vspModelInfo.setComponents(vspComponents);
+        }
+        //Get VSP component nic information
+        Map<String, List<Nic>> vspComponentNics;
+        try {
+            vspComponentNics = manualVspDataCollectionService.getVspComponentNics(vspId, version);
+        } catch (Exception ex) {
+            vspComponentNics = null;
+            LOGGER.error("Failed to get VSP component NIC data: {}", ex.getMessage(), ex);
+        }
+        if (MapUtils.isNotEmpty(vspComponentNics)) {
+            vspModelInfo.setNics(vspComponentNics);
+        }
+        return vspModelInfo;
     }
 
-    //Get VSP component nic information
-    Map<String, List<Nic>> vspComponentNics;
-    try {
-      vspComponentNics = manualVspDataCollectionService.getVspComponentNics(vspId, version);
-    } catch (Exception ex) {
-      vspComponentNics = null;
-      LOGGER.error("Failed to get VSP component NIC data: {}", ex.getMessage(), ex);
+    @Override
+    public ToscaServiceModel generateToscaModel(VspModelInfo vspModelInfo) {
+        ManualVspToscaGenerationService vspToscaGenerator = new ManualVspToscaGenerationService();
+        return vspToscaGenerator.createManualVspToscaServiceModel(vspModelInfo);
     }
-    if (MapUtils.isNotEmpty(vspComponentNics)) {
-      vspModelInfo.setNics(vspComponentNics);
-    }
-    return vspModelInfo;
-  }
-
-  @Override
-  public ToscaServiceModel generateToscaModel(VspModelInfo vspModelInfo) {
-    ManualVspToscaGenerationService vspToscaGenerator = new ManualVspToscaGenerationService();
-    return vspToscaGenerator.createManualVspToscaServiceModel(vspModelInfo);
-  }
 }