From: FrancescoFioraEst <francesco.fiora@est.tech>
Date: Thu, 1 Sep 2022 11:03:39 +0000 (+0100)
Subject: Fix Clamp build fails in policy participant module
X-Git-Tag: 6.3.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a6896ee8eaa79588ac45638ed236ba4d37ec1c42;p=policy%2Fclamp.git

Fix Clamp build fails in policy participant module

Fix Clamp build fails in policy participant module
while processing policies without topology template.

Issue-ID: POLICY-4339
Change-Id: I94f2f0e0acede233f33668e2b083c58e15181290
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
---

diff --git a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/acm/participant/policy/main/utils/TestListenerUtils.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/acm/participant/policy/main/utils/TestListenerUtils.java
index 1d6cb272b..d0ad72f83 100644
--- a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/acm/participant/policy/main/utils/TestListenerUtils.java
+++ b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/acm/participant/policy/main/utils/TestListenerUtils.java
@@ -146,19 +146,23 @@ public final class TestListenerUtils {
      * @param toscaServiceTemplate to add policies
      */
     public static void addPoliciesToToscaServiceTemplate(ToscaServiceTemplate toscaServiceTemplate) {
-        Set<String> policiesDirectoryContents = ResourceUtils.getDirectoryContents("policies");
+        var policiesDirectoryContents = ResourceUtils.getDirectoryContents("policies");
+        toscaServiceTemplate.getToscaTopologyTemplate().setPolicies(new ArrayList<>());
 
-        for (String policiesFilePath : policiesDirectoryContents) {
+        for (var policiesFilePath : policiesDirectoryContents) {
             if (!policiesFilePath.endsWith("yaml")) {
                 continue;
             }
 
-            String policiesString = ResourceUtils.getResourceAsString(policiesFilePath);
+            var policiesString = ResourceUtils.getResourceAsString(policiesFilePath);
 
-            ToscaServiceTemplate foundPoliciesSt =
+            var foundPoliciesSt =
                 yamlTranslator.fromYaml(policiesString, ToscaServiceTemplate.class);
-            toscaServiceTemplate.getToscaTopologyTemplate()
-                .setPolicies(foundPoliciesSt.getToscaTopologyTemplate().getPolicies());
+            if (foundPoliciesSt.getToscaTopologyTemplate() != null
+                    && foundPoliciesSt.getToscaTopologyTemplate().getPolicies() != null) {
+                toscaServiceTemplate.getToscaTopologyTemplate().getPolicies()
+                        .addAll(foundPoliciesSt.getToscaTopologyTemplate().getPolicies());
+            }
         }
     }