Fix Clamp build fails in policy participant module 25/130625/1
authorFrancescoFioraEst <francesco.fiora@est.tech>
Thu, 1 Sep 2022 11:03:39 +0000 (12:03 +0100)
committerFrancesco Fiora <francesco.fiora@est.tech>
Thu, 1 Sep 2022 11:05:41 +0000 (11:05 +0000)
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>
participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/acm/participant/policy/main/utils/TestListenerUtils.java

index 1d6cb27..d0ad72f 100644 (file)
@@ -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());
+            }
         }
     }