From 69712c820f5ed9345f0f788f8dea4ae16f5f5f00 Mon Sep 17 00:00:00 2001
From: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Date: Fri, 8 Jan 2021 14:28:15 +0100
Subject: Fix NPE

Fix NPE during the onboarding of a helm package.
NPE was thrown in HeatTreeManager.handleOrphans():
 *  tree.getHeat()::contains

Issue-ID: SDC-3185
Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Change-Id: I9e0461cfe18705b6fb53ae318e473bd4e2651305
---
 .../toscaTree/diffFileNames/out/expectedTree.json  | 14 +++++++++----
 .../similarDirectoryName/out/expectedTree.json     | 24 ++++++++++++++++------
 .../out/expectedTree.json                          | 22 ++++++++++++++------
 3 files changed, 44 insertions(+), 16 deletions(-)

(limited to 'openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree')

diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/diffFileNames/out/expectedTree.json b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/diffFileNames/out/expectedTree.json
index 4be1e1ddeb..de6026192c 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/diffFileNames/out/expectedTree.json
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/diffFileNames/out/expectedTree.json
@@ -1,23 +1,29 @@
 {
+  "heat": [],
   "nested": [
     {
       "fileName": "TOSCA-Metadata",
+      "heat": [],
       "nested": [
         {
-          "fileName": "TOSCA.meta"
+          "fileName": "TOSCA.meta",
+          "heat": []
         }
       ]
     },
     {
-      "fileName": "MainServiceTemplate.yaml"
+      "fileName": "MainServiceTemplate.yaml",
+      "heat": []
     },
     {
       "fileName": "Definitions",
+      "heat": [],
       "nested": [
         {
-          "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml"
+          "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml",
+          "heat": []
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/similarDirectoryName/out/expectedTree.json b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/similarDirectoryName/out/expectedTree.json
index 071887b2fb..c6e5cded6f 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/similarDirectoryName/out/expectedTree.json
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/similarDirectoryName/out/expectedTree.json
@@ -1,43 +1,55 @@
 {
+  "heat": [],
   "nested": [
     {
       "fileName": "TOSCA-Metadata",
+      "heat": [],
       "nested": [
         {
-          "fileName": "TOSCA.meta"
+          "fileName": "TOSCA.meta",
+          "heat": []
         }
       ]
     },
     {
-      "fileName": "MainServiceTemplate.yaml"
+      "fileName": "MainServiceTemplate.yaml",
+      "heat": []
     },
     {
       "fileName": "Definitions",
+      "heat": [],
       "nested": [
         {
-          "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml"
+          "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml",
+          "heat": []
         }
       ]
     },
     {
       "fileName": "Artifacts",
+      "heat": [],
       "nested": [
         {
           "fileName": "OTHER",
+          "heat": [],
           "nested": [
             {
-              "fileName": "clearWaterIMSOTHER.zip"
+              "fileName": "clearWaterIMSOTHER.zip",
+              "heat": []
             }
           ]
         },
         {
           "fileName": "Deployment",
+          "heat": [],
           "nested": [
             {
               "fileName": "OTHER",
+              "heat": [],
               "nested": [
                 {
-                  "fileName": "clearWaterIMSOTHERDEPLOYMENT.zip"
+                  "fileName": "clearWaterIMSOTHERDEPLOYMENT.zip",
+                  "heat": []
                 }
               ]
             }
@@ -46,4 +58,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/twoFilesUnderSameDirectory/out/expectedTree.json b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/twoFilesUnderSameDirectory/out/expectedTree.json
index 59fec70152..c73b6b9e7e 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/twoFilesUnderSameDirectory/out/expectedTree.json
+++ b/openecomp-be/lib/openecomp-heat-lib/src/test/resources/mock/toscaTree/twoFilesUnderSameDirectory/out/expectedTree.json
@@ -1,39 +1,49 @@
 {
+  "heat": [],
   "nested": [
     {
       "fileName": "TOSCA-Metadata",
+      "heat": [],
       "nested": [
         {
-          "fileName": "TOSCA.meta"
+          "fileName": "TOSCA.meta",
+          "heat": []
         }
       ]
     },
     {
-      "fileName": "MainServiceTemplate.yaml"
+      "fileName": "MainServiceTemplate.yaml",
+      "heat": []
     },
     {
       "fileName": "Definitions",
+      "heat": [],
       "nested": [
         {
-          "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml"
+          "fileName": "GlobalSubstitutionTypesServiceTemplate.yaml",
+          "heat": []
         }
       ]
     },
     {
       "fileName": "Artifacts",
+      "heat": [],
       "nested": [
         {
           "fileName": "OTHER",
+          "heat": [],
           "nested": [
             {
-              "fileName": "clearWaterIMSOTHERDEPLOYMENT.zip"
+              "fileName": "clearWaterIMSOTHERDEPLOYMENT.zip",
+              "heat": []
             },
             {
-              "fileName": "clearWaterIMSOTHER.zip"
+              "fileName": "clearWaterIMSOTHER.zip",
+              "heat": []
             }
           ]
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
-- 
cgit 1.2.3-korg