From 12142469280ab15d3c38802e6be7d7676435c2b9 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Thu, 14 Mar 2024 21:48:25 +0000
Subject: Make drools-pdp work with drools and java versions compatible with
 current DRL rules files syntax.

Issue-ID: POLICY-4857
Change-Id: If4b385bdef865d07114b8ea0e69abb4589f3a97b
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 feature-lifecycle/pom.xml                                             | 4 ++--
 .../src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'feature-lifecycle')

diff --git a/feature-lifecycle/pom.xml b/feature-lifecycle/pom.xml
index 5aea16be..757f23b4 100644
--- a/feature-lifecycle/pom.xml
+++ b/feature-lifecycle/pom.xml
@@ -3,7 +3,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
-  Modifications Copyright (C) 2023 Nordix Foundation.
+  Modifications Copyright (C) 2023-2024 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
@@ -111,7 +112,6 @@
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java
index e7656ae6..7237eb91 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java
@@ -283,7 +283,8 @@ public class LifecycleFsm implements Startable {
             policyTypesMap.values().stream()
                 .filter(PolicyTypeDroolsController.class::isInstance)
                 .map(PolicyTypeDroolsController.class::cast)
-                .filter(opController -> opController.getControllers().containsKey(controller.getName())).toList();
+                .filter(opController -> opController.getControllers().containsKey(controller.getName()))
+                .collect(Collectors.toList());
 
         for (PolicyTypeDroolsController opController : opControllers) {
             opController.remove(controller);
-- 
cgit 1.2.3-korg