From 30c10fa4c0351968d5e5b296291d8094ab93778d Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Thu, 29 Nov 2018 17:08:57 +0800 Subject: Modify download logic for csar file Change-Id: Iea00981a05b3a34a0ba2b7bc3eaef45da35c32e5 Issue-ID: USECASEUI-157 Signed-off-by: guochuyicmri --- .../service/lcm/impl/DefaultServiceTemplateService.java | 5 ++++- .../java/org/onap/usecaseui/server/util/UuiCommonUtil.java | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java index 704e4112..9aba5cca 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java @@ -31,6 +31,7 @@ import org.onap.usecaseui.server.service.lcm.domain.sdc.SDCCatalogService; import org.onap.usecaseui.server.service.lcm.domain.sdc.bean.SDCServiceTemplate; import org.onap.usecaseui.server.service.lcm.domain.sdc.exceptions.SDCCatalogException; import org.onap.usecaseui.server.util.RestfulServices; +import org.onap.usecaseui.server.util.UuiCommonUtil; import org.openecomp.sdc.toscaparser.api.NodeTemplate; import org.openecomp.sdc.toscaparser.api.Property; import org.openecomp.sdc.toscaparser.api.ToscaTemplate; @@ -94,7 +95,9 @@ public class DefaultServiceTemplateService implements ServiceTemplateService { String toPath = String.format("/home/uui/%s.csar", uuid); //String toPath = String.format("D:\\work/%s.csar", uuid); try { - downloadFile(toscaModelPath, toPath); + if(!UuiCommonUtil.isExistFile(toPath)){ + downloadFile(toscaModelPath, toPath); + } return extractTemplate(toPath, isVF); } catch (IOException e) { throw new SDCCatalogException("download csar file failed!", e); diff --git a/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java b/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java index 3a90e713..a1513fd4 100644 --- a/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java +++ b/server/src/main/java/org/onap/usecaseui/server/util/UuiCommonUtil.java @@ -16,6 +16,7 @@ package org.onap.usecaseui.server.util; import java.io.BufferedReader; +import java.io.File; import java.io.IOException; import java.lang.reflect.Array; import java.util.ArrayList; @@ -136,4 +137,14 @@ public class UuiCommonUtil { } return listPages; } + + public static boolean isExistFile(String path) { + + if (null == path || "".equals(path.trim())) { + return false; + } + + File targetFile = new File(path); + return targetFile.exists(); + } } -- cgit 1.2.3-korg