From 4a8b03f2ed94e0d7048aeca6346ec65f0c282192 Mon Sep 17 00:00:00 2001
From: talio <tali.orenbach@amdocs.com>
Date: Wed, 25 Oct 2017 11:25:29 +0300
Subject: upload

enable upload for files with extension in uppercase, while not saving the extension in lowercase in the DB

Issue - Id : SDC-526

Change-Id: I42baa128d533937f0b257df9f174230f21676b12
Signed-off-by: talio <tali.orenbach@amdocs.com>
---
 .../impl/OrchestrationTemplateCandidateManagerImpl.java            | 7 ++++---
 .../impl/VendorSoftwareProductManagerImpl.java                     | 2 +-
 .../impl/orchestration/process/OrchestrationProcessFactory.java    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src')

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java
index 3f6ffcc622..07a3fa7f2c 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java
@@ -30,6 +30,7 @@ import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
 import org.openecomp.sdc.activityLog.ActivityLogManager;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.common.errors.Messages;
+import org.openecomp.sdc.common.utils.CommonUtil;
 import org.openecomp.sdc.common.utils.SdcCommon;
 import org.openecomp.sdc.datatypes.error.ErrorLevel;
 import org.openecomp.sdc.datatypes.error.ErrorMessage;
@@ -258,20 +259,20 @@ public class OrchestrationTemplateCandidateManagerImpl
     OnboardingTypesEnum type =
         OnboardingTypesEnum.getOnboardingTypesEnum(vspDetails.getOnboardingOrigin());
 
-    if(vspDetails.getOnboardingOrigin().equals(OnboardingTypesEnum.ZIP.toString())) {
+    if(CommonUtil.isFileOriginFromZip(vspDetails.getOnboardingOrigin())) {
       FilesDataStructure structure = JsonUtil
           .json2Object(candidateDataEntity.get().getFilesDataStructure(), FilesDataStructure.class);
       String manifest = candidateService.createManifest(vspDetails, structure);
 
       mdcDataDebugMessage
           .debugExitMessage("VSP id", vspId);
-      return Optional.ofNullable(
+      return Optional.of(
           new ImmutablePair<>(OnboardingTypesEnum.ZIP.toString(),candidateService
               .replaceManifestInZip(candidateDataEntity.get().getContentData(),
               manifest, vspId, type)));
     }
 
-    return Optional.ofNullable(
+    return Optional.of(
         new ImmutablePair<>(vspDetails.getOnboardingOrigin(),candidateDataEntity.get()
             .getContentData().array()));
   }
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
index ceb635fc74..d4879da8d7 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
@@ -1102,7 +1102,7 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa
                 (vspDetails.getOnboardingOrigin()),
             uploadData.getContentData().array());
 
-    if (vspDetails.getOnboardingOrigin().equals(OnboardingTypesEnum.ZIP.name().toLowerCase())) {
+    if (CommonUtil.isFileOriginFromZip(vspDetails.getOnboardingOrigin())) {
       ValidationManager validationManager =
           ValidationManagerUtil.initValidationManager(fileContentMap);
       validationErrors.putAll(validationManager.validate());
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationProcessFactory.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationProcessFactory.java
index db43e0084e..516d85c2a7 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationProcessFactory.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationProcessFactory.java
@@ -28,11 +28,11 @@ public class OrchestrationProcessFactory {
   }
 
   public static Optional<OrchestrationTemplateProcessHandler> getInstance(String filePrefix) {
-    filePrefix = filePrefix == null ? null : filePrefix.toLowerCase().trim();
     if (filePrefix == null) {
       return Optional.empty();
     }
 
+    filePrefix = filePrefix.toLowerCase().trim();
     OnboardingTypesEnum onboardingTypesEnum = OnboardingTypesEnum.getOnboardingTypesEnum(filePrefix);
     if (onboardingTypesEnum == null) {
       return Optional.empty();
-- 
cgit 1.2.3-korg