From 7e84536e49b49cd1721b324d1ccaa17ca96456a7 Mon Sep 17 00:00:00 2001 From: imamSidero Date: Tue, 30 Aug 2022 19:10:31 +0100 Subject: [PATCH] Service-import sub import path fixed sub imported files path are fixed in importing a service Issue-ID: SDC-4150 Signed-off-by: Imam hussain Change-Id: Ibec3fd25f8316b678cfa76fe6c688d89701787d8 --- .../java/org/openecomp/sdc/be/components/csar/ServiceCsarInfo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ServiceCsarInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ServiceCsarInfo.java index 8dfe106713..5c948323a4 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ServiceCsarInfo.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ServiceCsarInfo.java @@ -103,7 +103,8 @@ public class ServiceCsarInfo extends CsarInfo { if (CollectionUtils.isNotEmpty(importsList)) { if (importsList.get(0) instanceof String) { List importPaths = new ArrayList<>(); - importsList.stream().forEach(importPath -> importPaths.add(Paths.get((String) importPath))); + importsList.stream() + .forEach(importPath -> importPaths.add(fileParentDir == null ? Paths.get((String) importPath) : fileParentDir.resolve(Paths.get((String) importPath)).normalize())); return importPaths; } else if (importsList.get(0) instanceof Map) { return getTemplateImportFilePathsMultiLineGrammar(importsList, fileParentDir); -- 2.16.6