diff options
Diffstat (limited to 'catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common')
2 files changed, 127 insertions, 11 deletions
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateDataHelper.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateDataHelper.java index ad5fb78e..7019ebe0 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateDataHelper.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateDataHelper.java @@ -15,22 +15,25 @@ */ package org.openo.commontosca.catalog.model.common; -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; - import org.openo.commontosca.catalog.common.ToolUtil; import org.openo.commontosca.catalog.db.entity.NodeTemplateData; import org.openo.commontosca.catalog.db.entity.ServiceTemplateData; import org.openo.commontosca.catalog.db.entity.ServiceTemplateMappingData; import org.openo.commontosca.catalog.db.entity.TemplateData; +import org.openo.commontosca.catalog.db.exception.CatalogResourceException; +import org.openo.commontosca.catalog.entity.response.CsarFileUriResponse; import org.openo.commontosca.catalog.model.entity.NodeTemplate; import org.openo.commontosca.catalog.model.entity.Parameters; import org.openo.commontosca.catalog.model.entity.RelationShip; import org.openo.commontosca.catalog.model.entity.ServiceTemplate; import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation; import org.openo.commontosca.catalog.model.entity.SubstitutionMapping; +import org.openo.commontosca.catalog.wrapper.PackageWrapper; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; import java.util.ArrayList; import java.util.Arrays; @@ -40,8 +43,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; - - public class TemplateDataHelper { /** @@ -122,8 +123,9 @@ public class TemplateDataHelper { * convert to service templates. * @param stdList ServiceTemplateData list * @return ServiceTemplate list + * @throws CatalogResourceException */ - public static ServiceTemplate[] convert2ServiceTemplates(List<ServiceTemplateData> stdList) { + public static ServiceTemplate[] convert2ServiceTemplates(List<ServiceTemplateData> stdList) throws CatalogResourceException { List<ServiceTemplate> stList = new ArrayList<>(); for (ServiceTemplateData std : stdList) { stList.add(convert2ServiceTemplate(std)); @@ -136,17 +138,26 @@ public class TemplateDataHelper { * covert to service template. * @param std ServiceTemplateData * @return ServiceTemplate + * @throws CatalogResourceException */ - public static ServiceTemplate convert2ServiceTemplate(ServiceTemplateData std) { + public static ServiceTemplate convert2ServiceTemplate(ServiceTemplateData std) throws CatalogResourceException { Parameters parameters = ToolUtil.fromJson(std.getInputs(), Parameters.class); ServiceTemplateOperation[] operations = ToolUtil.fromJson(std.getOperations(), ServiceTemplateOperation[].class); - + String downloadUri = buildSTDownloadUri(std.getCsarId(), std.getDownloadUri()); + return new ServiceTemplate(std.getServiceTemplateId(), std.getTemplateName(), std.getVendor(), - std.getVersion(), std.getCsarId(), std.getType(), std.getDownloadUri(), + std.getVersion(), std.getCsarId(), std.getType(), downloadUri, parameters.getInputs(), parameters.getOutputs(), operations); } + private static String buildSTDownloadUri(String packageId, String stFileName) + throws CatalogResourceException { + CsarFileUriResponse stDownloadUri = + PackageWrapper.getInstance().getCsarFileDownloadUri(packageId, stFileName); + return stDownloadUri.getDownloadUri(); + } + /** * covert to nodeTemplates. * @param ntdList NodeTemplateData list diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java new file mode 100644 index 00000000..945cc92a --- /dev/null +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/common/TemplateUtils.java @@ -0,0 +1,105 @@ +/** + * Copyright 2016 ZTE Corporation. + * + * 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 + * + * 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.openo.commontosca.catalog.model.common; + +import org.openo.commontosca.catalog.db.exception.CatalogResourceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipInputStream; + +public class TemplateUtils { + private static final Logger logger = LoggerFactory.getLogger(TemplateUtils.class); + + /** + * @param zipFileName + * @param zipEntryName + * @return + * @throws CatalogResourceException + */ + public static String readStringFromZipFile(String zipFileName, String zipEntryName) throws CatalogResourceException { + String[] lines = readFromZipFile(zipFileName, zipEntryName); + StringBuffer sb = new StringBuffer(); + for (String line : lines) { + sb.append(line).append(System.lineSeparator()); + } + return sb.toString(); + } + + /** + * @param zipFileName + * @param zipEntryName + * @return + * @throws CatalogResourceException + */ + @SuppressWarnings("resource") + public static String[] readFromZipFile(String zipFileName, String zipEntryName) + throws CatalogResourceException { + ZipInputStream zipIns = null; + BufferedReader zipEntryBr = null; + try { + ZipFile zipFile = new ZipFile(zipFileName); + + zipIns = new ZipInputStream(new BufferedInputStream(new FileInputStream(zipFileName))); + ZipEntry zipEntry; + while ((zipEntry = zipIns.getNextEntry()) != null) { + if (zipEntryName.equals(zipEntry.getName()) + || (zipEntryName.replaceAll("/", File.separator)).equals(zipEntry.getName())) { + zipEntryBr = new BufferedReader(new InputStreamReader(zipFile.getInputStream(zipEntry))); + List<String> lineList = new ArrayList<>(); + String line; + while ((line = zipEntryBr.readLine()) != null) { + lineList.add(line); + } + + return lineList.toArray(new String[0]); + } + } + } catch (IOException e) { + throw new CatalogResourceException("Parse Tosca Meta Fail.", e); + } finally { + closeStreamAndReader(zipIns, zipEntryBr); + } + return new String[0]; + } + + private static void closeStreamAndReader(ZipInputStream zin, BufferedReader br) { + if (br != null) { + try { + br.close(); + } catch (IOException e1) { + logger.error("Buffered reader close failed !"); + } + } + if (zin != null) { + try { + zin.closeEntry(); + } catch (IOException e2) { + logger.error("Zip inputStream close failed !"); + } + } + } +} |