Fix topic configurations.

- adjust kafka configurations
- remove UEB references

Issue-ID: POLICY-4955
Change-Id: Ie3ff62a0ba5531ae4c0d123f214a50bb7f721807
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

5 files changed, 14 insertions, 14 deletions

diff --git a/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureApi.java b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureApi.java
index 87001ad6..8edf394e 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureApi.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureApi.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -232,7 +233,7 @@ public interface PolicyEngineFeatureApi extends OrderedService {
     }
 
     /**
-     * Intercept an event from UEB/DMaaP before the PolicyEngine processes it.
+     * Intercept an event from Bus before the PolicyEngine processes it.
      *
      * @return True if this feature intercepts and takes ownership of the operation
      *         preventing the invocation of lower priority features. False, otherwise.
diff --git a/policy-management/src/main/java/org/onap/policy/drools/persistence/FileSystemPersistence.java b/policy-management/src/main/java/org/onap/policy/drools/persistence/FileSystemPersistence.java
index d35f5469..9fb76d87 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/persistence/FileSystemPersistence.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/persistence/FileSystemPersistence.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -152,13 +153,13 @@ public class FileSystemPersistence implements SystemPersistence {
 
     protected Properties getProperties(Path propertiesPath) {
         if (!Files.exists(propertiesPath)) {
-            throw new IllegalArgumentException("properties for " + propertiesPath.toString() + " are not persisted.");
+            throw new IllegalArgumentException("properties for " + propertiesPath + " are not persisted.");
         }
 
         try {
             return PropertyUtil.getProperties(propertiesPath.toFile());
         } catch (final Exception e) {
-            throw new IllegalArgumentException("can't read properties for " + propertiesPath.toString(), e);
+            throw new IllegalArgumentException("can't read properties for " + propertiesPath, e);
         }
     }
 
diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java
index 1201c26e..f008407c 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java
@@ -242,7 +242,7 @@ public class PdpdConfiguration {
         } else {
             throw new IllegalArgumentException(
                     "property \"requestID\" is of type \"java.lang.String\", but got "
-                            + value.getClass().toString());
+                            + value.getClass());
         }
     }
 
@@ -257,7 +257,7 @@ public class PdpdConfiguration {
         } else {
             throw new IllegalArgumentException(
                     "property \"entity\" is of type \"java.lang.String\", but got "
-                            + value.getClass().toString());
+                            + value.getClass());
         }
     }
 
diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
index 75e7c74a..3fc2e292 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2017-2022 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -41,13 +42,10 @@ import org.onap.policy.drools.stats.PolicyStatsManager;
 
 /**
  * Policy Engine, the top abstraction for the Drools PDP Policy Engine. It abstracts away a Drools
- * PDP Engine from management purposes. This is the best place to looking at the code from a top
- * down approach. Other managed entities can be obtained from the PolicyEngine, hierarchically. <br>
+ * PDP Engine from management purposes. This is the best place to looking at the code from a top-down
+ * approach. Other managed entities can be obtained from the PolicyEngine, hierarchically. <br>
  * PolicyEngine 1 --- * PolicyController 1 --- 1 DroolsController 1 --- 1 PolicyContainer 1 --- *
  * PolicySession <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1
- * UebTopicReader <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1
- * DmaapTopicReader <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1
- * DmaapTopicWriter <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1
  * RestTopicReader <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1
  * RestTopicWriter <br> PolicyEngine 1 --- 1 ManagementServer
  */
diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java b/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
index 06b3f4ea..2c85c26e 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java
@@ -3,7 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2021, 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.
@@ -140,9 +140,9 @@ public class AggregatedPolicyController implements PolicyController, TopicListen
         this.name = name;
 
         /*
-         * 1. Register read topics with network infrastructure (ueb, dmaap, rest) 2. Register write
-         * topics with network infrastructure (ueb, dmaap, rest) 3. Register with drools
-         * infrastructure
+         * 1. Register read topics with network infrastructure
+         * 2. Register write topics with network infrastructure
+         * 3. Register with drools infrastructure
          */
 
         // Create/Reuse Readers/Writers for all event sources endpoints