Use SDC Tosca Jar to extract and parse SDC CSAR

Change-Id: I0e8261ed338eaafa35bb663f95a19fe97be57652
Issue-ID: EXTAPI-205
Signed-off-by: aosull01 <adrian.osullivan@huawei.com>

2 files changed, 119 insertions, 348 deletions

diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java
index 228e12d..5e3e4cf 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java
@@ -1,27 +1,30 @@
 /**
- *     Copyright (c) 2018 Orange
+ * Copyright (c) 2018 Orange
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
  *
- *         http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  */
 package org.onap.nbi.apis.servicecatalog;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.io.FileUtils;
 import org.onap.nbi.apis.servicecatalog.jolt.FindServiceSpecJsonTransformer;
 import org.onap.nbi.apis.servicecatalog.jolt.GetServiceSpecJsonTransformer;
 import org.onap.nbi.apis.serviceorder.ServiceCatalogUrl;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,45 +35,56 @@ import org.springframework.util.MultiValueMap;
 @Service
 public class ServiceSpecificationService {
 
-    @Autowired
-    SdcClient sdcClient;
+  @Autowired
+  SdcClient sdcClient;
 
-    @Autowired
-    GetServiceSpecJsonTransformer getServiceSpecJsonTransformer;
+  @Autowired
+  GetServiceSpecJsonTransformer getServiceSpecJsonTransformer;
 
-    @Autowired
-    FindServiceSpecJsonTransformer findServiceSpecJsonTransformer;
+  @Autowired
+  FindServiceSpecJsonTransformer findServiceSpecJsonTransformer;
 
-    @Autowired
-    ToscaInfosProcessor toscaInfosProcessor;
+  @Autowired
+  ToscaInfosProcessor toscaInfosProcessor;
 
-    @Autowired
-    private ServiceCatalogUrl serviceCatalogUrl;
+  @Autowired
+  private ServiceCatalogUrl serviceCatalogUrl;
 
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ServiceSpecificationService.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(ServiceSpecificationService.class);
 
 
-    public Map get(String serviceSpecId) {
-        Map sdcResponse = sdcClient.callGet(serviceSpecId);
-        LinkedHashMap serviceCatalogResponse = (LinkedHashMap) getServiceSpecJsonTransformer.transform(sdcResponse);
-        Map toscaInfosTopologyTemplate = toscaInfosProcessor.getToscaInfos(serviceCatalogResponse);
-        if (toscaInfosTopologyTemplate != null) {
-            LOGGER.debug("tosca file found, retrieving informations");
-            toscaInfosProcessor.buildResponseWithToscaInfos(toscaInfosTopologyTemplate, serviceCatalogResponse);
-        } else {
-            LOGGER.debug("no tosca file found, partial response");
-        }
-        return serviceCatalogResponse;
+  public Map get(String serviceSpecId) {
+    Map sdcResponse = sdcClient.callGet(serviceSpecId);
+    LinkedHashMap serviceCatalogResponse =
+        (LinkedHashMap) getServiceSpecJsonTransformer.transform(sdcResponse);
+    String toscaModelUrl = (String) sdcResponse.get("toscaModelURL");
+    String serviceId = (String) sdcResponse.get("id");
+    File toscaFile = sdcClient.callGetWithAttachment(toscaModelUrl);
+    Path pathToToscaCsar = toscaFile.toPath().toAbsolutePath();
+    try {
+      toscaInfosProcessor.buildResponseWithSdcToscaParser(pathToToscaCsar, serviceCatalogResponse);
+    } catch (SdcToscaParserException e) {
+      LOGGER.debug("unable to build response from tosca csar using sdc-parser, partial response : "
+          + pathToToscaCsar.toString() + " " + e.getMessage());
     }
+    try {
+      if (toscaFile != null) {
+        LOGGER.debug("deleting tosca archive : " + toscaFile.getName());
+        FileUtils.forceDelete(toscaFile);
+      }
+    } catch (IOException e) {
+      LOGGER.error("unable to delete temp directory tosca file for id : " + serviceId, e);
+    }
+    return serviceCatalogResponse;
+  }
 
-    public List<LinkedHashMap> find(MultiValueMap<String, String> parametersMap) {
-        List<LinkedHashMap> sdcResponse = sdcClient.callFind(parametersMap);
-        List<LinkedHashMap> serviceCatalogResponse = new ArrayList<>();
-        if(!CollectionUtils.isEmpty(sdcResponse)){
-            serviceCatalogResponse =
-                findServiceSpecJsonTransformer.transform(sdcResponse);
-        }
-        return serviceCatalogResponse;
+  public List<LinkedHashMap> find(MultiValueMap<String, String> parametersMap) {
+    List<LinkedHashMap> sdcResponse = sdcClient.callFind(parametersMap);
+    List<LinkedHashMap> serviceCatalogResponse = new ArrayList<>();
+    if (!CollectionUtils.isEmpty(sdcResponse)) {
+      serviceCatalogResponse = findServiceSpecJsonTransformer.transform(sdcResponse);
     }
+    return serviceCatalogResponse;
+  }
 }
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java b/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java
index 99a1657..fff4444 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java
@@ -13,24 +13,11 @@
  */
 package org.onap.nbi.apis.servicecatalog;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.nio.file.Path;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import org.apache.commons.io.FileUtils;
-import org.onap.nbi.exceptions.TechnicalException;
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
@@ -40,313 +27,83 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
 @Service
 public class ToscaInfosProcessor {
 
-    @Autowired
-    SdcClient sdcClient;
-
-    final ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); // jackson databind
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ToscaInfosProcessor.class);
-
-    public void buildResponseWithToscaInfos(Map toscaInfosTopologyTemplate,
-            Map serviceCatalogResponse) {
-        if (toscaInfosTopologyTemplate.get("inputs") != null) {
-            ArrayList serviceSpecCharacteristic = new ArrayList();
-            LinkedHashMap toscaInfos = (LinkedHashMap) toscaInfosTopologyTemplate.get("inputs");
-            Set<Entry<String, LinkedHashMap>> stringLinkedHashMapEntry = (Set<Entry<String, LinkedHashMap>>) toscaInfos
-                .entrySet();
-
-            for (Map.Entry<String,LinkedHashMap> key :stringLinkedHashMapEntry) {
-                String keyString = key.getKey();
-                LinkedHashMap inputParameter = key.getValue();
-                LinkedHashMap mapParameter = new LinkedHashMap();
-                String parameterType = (String) inputParameter.get("type");
-                mapParameter.put("name", keyString);
-                mapParameter.put("description", inputParameter.get("description"));
-                mapParameter.put("valueType", parameterType);
-                mapParameter.put("@type", "ONAPserviceCharacteristic");
-                mapParameter.put("required", inputParameter.get("required"));
-                mapParameter.put("status", inputParameter.get("status"));
-                List<LinkedHashMap> serviceSpecCharacteristicValues =
-                    buildServiceSpecCharacteristicsValues(inputParameter, parameterType);
-                mapParameter.put("serviceSpecCharacteristicValue", serviceSpecCharacteristicValues);
-                serviceSpecCharacteristic.add(mapParameter);
-            }
-
-            serviceCatalogResponse.put("serviceSpecCharacteristic", serviceSpecCharacteristic);
-        }
-        LinkedHashMap nodeTemplate = (LinkedHashMap) toscaInfosTopologyTemplate.get("node_templates");
-
-        List<LinkedHashMap> resourceSpecifications =
-                (List<LinkedHashMap>) serviceCatalogResponse.get("resourceSpecification");
-        for (LinkedHashMap resourceSpecification : resourceSpecifications) {
-            if(resourceSpecification.get("id")!=null){
-                String id = (String) resourceSpecification.get("id");
-                LOGGER.debug("get tosca infos for service id: {}", id);
-                LinkedHashMap toscaInfosFromResourceId = getToscaInfosFromResourceUUID(nodeTemplate, id);
-                if (toscaInfosFromResourceId != null && toscaInfosFromResourceId.get("customizationUUID")!=null) {
-                    resourceSpecification.put("modelCustomizationId", toscaInfosFromResourceId.get("customizationUUID"));
-                }
-            }
-        }
-    }
-    
-    public void buildResponseWithSdcToscaParser(Path path, Map serviceCatalogResponse) throws SdcToscaParserException {
-
-        SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
-        ISdcCsarHelper sdcCsarHelper = factory.getSdcCsarHelper(path.toFile().getAbsolutePath(),false);
-        List<Input> inputs = sdcCsarHelper.getServiceInputs();
-        if(inputs != null && inputs.size() > 0) {
-            ArrayList serviceSpecCharacteristic = new ArrayList();
-            for(Input input : inputs) {
-                    LinkedHashMap mapParameter = new LinkedHashMap();
-                    mapParameter.put("name", input.getName());
-                    mapParameter.put("description", input.getDescription());
-                    mapParameter.put("valueType", input.getType());
-                    mapParameter.put("@type", "ONAPserviceCharacteristic");
-                    mapParameter.put("required", input.isRequired());
-                    mapParameter.put("status", null);
-                    mapParameter.put("serviceSpecCharacteristicValue", null);
-                    // If this Input has a default value, then put it in serviceSpecCharacteristicValue
-                    if (input.getDefault() != null)
-                    {
-                    List<LinkedHashMap> serviceSpecCharacteristicValues =
-                            buildServiceSpecCharacteristicsValuesFromSdc(input);
-                        mapParameter.put("serviceSpecCharacteristicValue", serviceSpecCharacteristicValues);
-                    }
-                    serviceSpecCharacteristic.add(mapParameter);
-            }
-            serviceCatalogResponse.put("serviceSpecCharacteristic", serviceSpecCharacteristic);
-           }
-        List<NodeTemplate> nodeTemplates = sdcCsarHelper.getServiceNodeTemplates();
-
-        List<LinkedHashMap> resourceSpecifications =
-                (List<LinkedHashMap>) serviceCatalogResponse.get("resourceSpecification");
-        for (LinkedHashMap resourceSpecification : resourceSpecifications) {
-            if(resourceSpecification.get("id")!=null){
-                String id = (String) resourceSpecification.get("id");
-                LOGGER.debug("get tosca infos for service id: {}", id);
-                NodeTemplate nodeTemplate = null;
-                for(NodeTemplate node : nodeTemplates) {
-                        if(node.getMetaData().getValue("UUID").equals(id)) {
-                                nodeTemplate = node;
-                                break;
-                        }
-                }
-                if(nodeTemplate == null)
-                        continue;
-                resourceSpecification.put("modelCustomizationId", sdcCsarHelper.getNodeTemplateCustomizationUuid(nodeTemplate));
-            }
+  @Autowired
+  SdcClient sdcClient;
+
+  final ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); // jackson databind
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(ToscaInfosProcessor.class);
+
+
+
+  public void buildResponseWithSdcToscaParser(Path path, Map serviceCatalogResponse)
+      throws SdcToscaParserException {
+
+    SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
+    ISdcCsarHelper sdcCsarHelper = factory.getSdcCsarHelper(path.toFile().getAbsolutePath(), false);
+    List<Input> inputs = sdcCsarHelper.getServiceInputs();
+    if (inputs != null && inputs.size() > 0) {
+      ArrayList serviceSpecCharacteristic = new ArrayList();
+      for (Input input : inputs) {
+        LinkedHashMap mapParameter = new LinkedHashMap();
+        mapParameter.put("name", input.getName());
+        mapParameter.put("description", input.getDescription());
+        mapParameter.put("valueType", input.getType());
+        mapParameter.put("@type", "ONAPserviceCharacteristic");
+        mapParameter.put("required", input.isRequired());
+        mapParameter.put("status", null);
+        mapParameter.put("serviceSpecCharacteristicValue", null);
+        // If this Input has a default value, then put it in serviceSpecCharacteristicValue
+        if (input.getDefault() != null) {
+          List<LinkedHashMap> serviceSpecCharacteristicValues =
+              buildServiceSpecCharacteristicsValuesFromSdc(input);
+          mapParameter.put("serviceSpecCharacteristicValue", serviceSpecCharacteristicValues);
         }
+        serviceSpecCharacteristic.add(mapParameter);
+      }
+      serviceCatalogResponse.put("serviceSpecCharacteristic", serviceSpecCharacteristic);
     }
-
-        
-    private List<LinkedHashMap> buildServiceSpecCharacteristicsValuesFromSdc(Input input) {
-		
-    	List<LinkedHashMap> serviceSpecCharacteristicValues = new ArrayList<>();
-    	LinkedHashMap serviceSpecCharacteristicValue = new LinkedHashMap();
-    	
-    	serviceSpecCharacteristicValue.put("isDefault", true);
-        serviceSpecCharacteristicValue.put("value", input.getDefault());
-        serviceSpecCharacteristicValue.put("valueType", input.getType());
-        serviceSpecCharacteristicValues.add(serviceSpecCharacteristicValue);
-        
-		return serviceSpecCharacteristicValues;
-	}
-
-	private List<LinkedHashMap> buildServiceSpecCharacteristicsValues(LinkedHashMap parameter, String parameterType) {
-        List<LinkedHashMap> serviceSpecCharacteristicValues = new ArrayList<>();
-        if (!"map".equalsIgnoreCase(parameterType) && !"list".equalsIgnoreCase(parameterType)) {
-            LOGGER.debug("get tosca infos for serviceSpecCharacteristicValues of type map or string : {}", parameter);
-            Object aDefault = parameter.get("default");
-            if (parameter.get("entry_schema") != null) {
-                ArrayList entrySchema = (ArrayList) parameter.get("entry_schema");
-                if (!CollectionUtils.isEmpty(entrySchema)) {
-                    buildCharacteristicValuesFormShema(parameterType, serviceSpecCharacteristicValues, aDefault,
-                            entrySchema);
-                }
-            }
-        }
-        return serviceSpecCharacteristicValues;
-    }
-
-    private void buildCharacteristicValuesFormShema(String parameterType,
-            List<LinkedHashMap> serviceSpecCharacteristicValues, Object aDefault, ArrayList entrySchema) {
-        LinkedHashMap constraints = (LinkedHashMap) entrySchema.get(0);
-        if (constraints != null) {
-            ArrayList constraintsList = (ArrayList) constraints.get("constraints");
-            if (!CollectionUtils.isEmpty(constraintsList)) {
-                LinkedHashMap valuesMap = (LinkedHashMap) constraintsList.get(0);
-                if (valuesMap != null) {
-                    List<Object> values = (List<Object>) valuesMap.get("valid_values");
-                    for (Object value : values) {
-                        String stringValue = value.toString();
-                        LinkedHashMap serviceSpecCharacteristicValue = new LinkedHashMap();
-                        serviceSpecCharacteristicValue.put("isDefault",
-                                aDefault != null && aDefault.toString().equals(stringValue));
-                        serviceSpecCharacteristicValue.put("value", stringValue);
-                        serviceSpecCharacteristicValue.put("valueType", parameterType);
-                        serviceSpecCharacteristicValues.add(serviceSpecCharacteristicValue);
-                    }
-                }
-            }
+    List<NodeTemplate> nodeTemplates = sdcCsarHelper.getServiceNodeTemplates();
+
+    List<LinkedHashMap> resourceSpecifications =
+        (List<LinkedHashMap>) serviceCatalogResponse.get("resourceSpecification");
+    for (LinkedHashMap resourceSpecification : resourceSpecifications) {
+      if (resourceSpecification.get("id") != null) {
+        String id = (String) resourceSpecification.get("id");
+        LOGGER.debug("get tosca infos for service id: {}", id);
+        NodeTemplate nodeTemplate = null;
+        for (NodeTemplate node : nodeTemplates) {
+          if (node.getMetaData().getValue("UUID").equals(id)) {
+            nodeTemplate = node;
+            break;
+          }
         }
+        if (nodeTemplate == null)
+          continue;
+        resourceSpecification.put("modelCustomizationId",
+            sdcCsarHelper.getNodeTemplateCustomizationUuid(nodeTemplate));
+      }
     }
+  }
 
 
-    private LinkedHashMap getToscaInfosFromResourceUUID(LinkedHashMap nodeTemplates, String name) {
-        if(nodeTemplates!=null) {
-            for (Object nodeTemplateObject : nodeTemplates.values()) {
-                LinkedHashMap nodeTemplate = (LinkedHashMap) nodeTemplateObject;
-                LinkedHashMap metadata = (LinkedHashMap) nodeTemplate.get("metadata");
-                if(metadata.get("UUID")!=null && metadata.get("type")!=null) {
-                    String metadataUUID = (String) metadata.get("UUID");
-                    String metadataType = (String) metadata.get("type");
-                    if ("VF".equalsIgnoreCase(metadataType) && name!=null &&  name.equalsIgnoreCase(metadataUUID)) {
-                        return metadata;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
+  private List<LinkedHashMap> buildServiceSpecCharacteristicsValuesFromSdc(Input input) {
 
-    public Map getToscaInfos(Map sdcResponse) {
+    List<LinkedHashMap> serviceSpecCharacteristicValues = new ArrayList<>();
+    LinkedHashMap serviceSpecCharacteristicValue = new LinkedHashMap();
 
-        LinkedHashMap topologyTemplate = null;
-
-        String toscaModelUrl = (String) sdcResponse.get("toscaModelURL");
-        String serviceId = (String) sdcResponse.get("id");
-        File toscaFile = sdcClient.callGetWithAttachment(toscaModelUrl);
-        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-        String tempFolderName = serviceId + timestamp;
-        File folderTemp = null;
-
-        try {
-            unZipArchive(toscaFile.getName(), tempFolderName);
-            folderTemp = new File(tempFolderName);
-            LOGGER.debug("temp folder for tosca files : " + folderTemp.getName());
-
-            LinkedHashMap toscaMetaFileHashMap = parseToscaFile(tempFolderName + "/TOSCA-Metadata/TOSCA.meta");
-            topologyTemplate = getToscaTopologyTemplateNode(tempFolderName, toscaMetaFileHashMap);
-            return topologyTemplate;
-        } catch (TechnicalException e) {
-            LOGGER.error("unable to parse tosca file for id : " + serviceId, e);
-            return  topologyTemplate;
-        }
-        finally {
-            deleteTempFiles(serviceId, toscaFile, folderTemp);
-        }
-
-    }
-
-    private LinkedHashMap getToscaTopologyTemplateNode(String tempFolderName,LinkedHashMap toscaMetaFileHashMap) {
-        LinkedHashMap topologyTemplate = null;
-        if (toscaMetaFileHashMap.get("Entry-Definitions") != null) {
-            String toscaFilePath = (String) toscaMetaFileHashMap.get("Entry-Definitions");
-            LinkedHashMap toscaFileHashMap = parseToscaFile(tempFolderName + "/" + toscaFilePath);
-            if (toscaFileHashMap.get("topology_template") != null) {
-                topologyTemplate = (LinkedHashMap) toscaFileHashMap.get("topology_template");
-            } else {
-                LOGGER.error("no Entry-Definitions node in TOSCA.meta");
-            }
-        } else {
-            LOGGER.error("no topology_template node in tosca file");
-        }
-        return topologyTemplate;
-    }
-
-
-    private void deleteTempFiles(String serviceId, File toscaFile, File folderTemp) {
-        try {
-            if(folderTemp!=null){
-                LOGGER.debug("deleting temp folder for tosca files : " + folderTemp.getName());
-                FileUtils.deleteDirectory(folderTemp);
-            }
-            LOGGER.debug("deleting tosca archive : " + toscaFile.getName());
-            FileUtils.forceDelete(toscaFile);
-        } catch (IOException e) {
-            LOGGER.error("unable to delete temp directory tosca file for id : " + serviceId, e);
-        }
-    }
-
-    private LinkedHashMap parseToscaFile(String fileName) {
-
-        File toscaFile = new File(fileName);
-        if (!toscaFile.exists()) {
-            throw new TechnicalException("unable to find  file : " + fileName);
-        }
-        try {
-            return (LinkedHashMap) mapper.readValue(toscaFile, Object.class);
-        } catch (IOException e) {
-            LOGGER.warn("unable to parse tosca file : " + fileName, e);
-            throw new TechnicalException("Unable to parse tosca file : " + fileName);
-
-        } catch (NullPointerException e) {
-            LOGGER.warn("unable to find tosca file : " + fileName, e);
-            throw new TechnicalException("unable to find tosca file : " + fileName);
-        }
-    }
-
-
-    /**
-     * Unzip it
-     *
-     * @param zipFile input zip file
-     * @param outputFolder zip file output folder
-     */
-    private void unZipArchive(String zipFile, String outputFolder) {
-
-        byte[] buffer = new byte[1024];
-
-        try {
-
-            // create output directory is not exists
-            File folder = new File(outputFolder);
-            if (!folder.exists()) {
-                folder.mkdir();
-            }
-
-            // get the zip file content
-            try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile))) {
-                // get the zipped file list entry
-                ZipEntry ze = zis.getNextEntry();
-
-                while (ze != null) {
-
-                    String fileName = ze.getName();
-                    File newFile = new File(outputFolder + File.separator + fileName);
-
-                    LOGGER.debug("File to unzip : " + newFile.getAbsoluteFile());
-
-                    // create all non exists folders
-                    // else you will hit FileNotFoundException for compressed folder
-                    new File(newFile.getParent()).mkdirs();
-
-                    try (FileOutputStream fos = new FileOutputStream(newFile)) {
-
-                        int len;
-                        while ((len = zis.read(buffer)) > 0) {
-                            fos.write(buffer, 0, len);
-                        }
-                    }
-                    ze = zis.getNextEntry();
-                }
-                zis.closeEntry();
-            }
-
-            LOGGER.debug("Done");
-
-        } catch (IOException ex) {
-            LOGGER.error("Error while unzipping ToscaModel archive from ONAP", ex);
-            throw new TechnicalException("Error while unzipping ToscaModel archive from ONAP");
-        }
-    }
+    serviceSpecCharacteristicValue.put("isDefault", true);
+    serviceSpecCharacteristicValue.put("value", input.getDefault());
+    serviceSpecCharacteristicValue.put("valueType", input.getType());
+    serviceSpecCharacteristicValues.add(serviceSpecCharacteristicValue);
 
+    return serviceSpecCharacteristicValues;
+  }
 
 }