Use unique handling for the rApp resources

[nonrtric/plt/rappmanager.git] / rapp-manager-models / src / main / java / com / oransc / rappmanager / models / csar / RappCsarConfigurationHandler.java

diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
index bbf59bb..73c644e 100755 (executable)
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
@@ -27,12 +27,14 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -53,15 +55,18 @@ public class RappCsarConfigurationHandler {
 
 
     public boolean isValidRappPackage(MultipartFile multipartFile) {
-        return multipartFile != null && multipartFile.getOriginalFilename() != null
-                       && multipartFile.getOriginalFilename().endsWith(".csar") && isFileExistsInCsar(multipartFile,
-                ACM_COMPOSITION_JSON_LOCATION);
+        String originalFilename = multipartFile.getOriginalFilename();
+        if (originalFilename != null) {
+            return originalFilename.endsWith(".csar") && isFileExistsInCsar(multipartFile,
+                    ACM_COMPOSITION_JSON_LOCATION);
+        }
+        return false;
     }
 
     boolean isFileExistsInCsar(MultipartFile multipartFile, String fileLocation) {
-        try (ZipInputStream zipInputStream = new ZipInputStream(multipartFile.getInputStream())) {
-            ZipEntry zipEntry;
-            while ((zipEntry = zipInputStream.getNextEntry()) != null) {
+        try (ZipArchiveInputStream zipArchiveInputStream = new ZipArchiveInputStream(multipartFile.getInputStream())) {
+            ArchiveEntry zipEntry;
+            while ((zipEntry = zipArchiveInputStream.getNextEntry()) != null) {
                 if (zipEntry.getName().matches(fileLocation)) {
                     return Boolean.TRUE;
                 }
@@ -96,13 +101,13 @@ public class RappCsarConfigurationHandler {
     ByteArrayOutputStream getFileFromCsar(File csarFile, String fileLocation) {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         try (FileInputStream fileInputStream = new FileInputStream(csarFile);
-             ZipInputStream zipInputStream = new ZipInputStream(fileInputStream)) {
-            ZipEntry entry;
-            while ((entry = zipInputStream.getNextEntry()) != null) {
+             ZipArchiveInputStream zipArchiveInputStream = new ZipArchiveInputStream(fileInputStream)) {
+            ArchiveEntry entry;
+            while ((entry = zipArchiveInputStream.getNextEntry()) != null) {
                 if (!entry.isDirectory() && entry.getName().equals(fileLocation)) {
                     byte[] buffer = new byte[1024];
                     int bytesRead;
-                    while ((bytesRead = zipInputStream.read(buffer)) != -1) {
+                    while ((bytesRead = zipArchiveInputStream.read(buffer)) != -1) {
                         byteArrayOutputStream.write(buffer, 0, bytesRead);
                     }
                 }
@@ -141,12 +146,10 @@ public class RappCsarConfigurationHandler {
             File csarFile = getCsarFile(rapp);
             if (csarFile.exists()) {
                 rappResources.setAcm(RappResources.ACMResources.builder().compositionDefinitions(
-                                getFileListFromCsar(csarFile, ACM_DEFINITION_LOCATION).get(0))
-                                             .compositionInstances(getFileListFromCsar(csarFile, ACM_INSTANCES_LOCATION))
-                                             .build());
-                rappResources.setSme(RappResources.SMEResources.builder()
-                                             .providerFunctions(getFileListFromCsar(csarFile,
-                                                     SME_PROVIDER_FUNCS_LOCATION))
+                        getFileListFromCsar(csarFile, ACM_DEFINITION_LOCATION).iterator().next()).compositionInstances(
+                        getFileListFromCsar(csarFile, ACM_INSTANCES_LOCATION)).build());
+                rappResources.setSme(RappResources.SMEResources.builder().providerFunctions(
+                                getFileListFromCsar(csarFile, SME_PROVIDER_FUNCS_LOCATION))
                                              .serviceApis(getFileListFromCsar(csarFile, SME_SERVICE_APIS_LOCATION))
                                              .invokers(getFileListFromCsar(csarFile, SME_INVOKERS_LOCATION)).build());
             }
@@ -156,14 +159,15 @@ public class RappCsarConfigurationHandler {
         return rappResources;
     }
 
-    List<String> getFileListFromCsar(File csarFile, String dirLocation) {
+    Set<String> getFileListFromCsar(File csarFile, String dirLocation) {
         try (ZipFile zipFile = new ZipFile(csarFile)) {
             return zipFile.stream().filter(Predicate.not(ZipEntry::isDirectory)).map(ZipEntry::getName)
                            .filter(name -> name.startsWith(dirLocation))
-                           .map(name -> name.substring(name.lastIndexOf("/") + 1, name.lastIndexOf("."))).toList();
+                           .map(name -> name.substring(name.lastIndexOf("/") + 1, name.lastIndexOf(".")))
+                           .collect(Collectors.toSet());
         } catch (IOException e) {
             logger.warn("Error in listing the files from csar", e);
         }
-        return List.of();
+        return Set.of();
     }
 }