Remove Dmaap from apex-pdp

Issue-ID: POLICY-4402
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Change-Id: I76c284b6ff7ec0ce77189f3f2bc93d5b91d4eb24

6 files changed, 37 insertions, 37 deletions

diff --git a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java
index 7912d377f..659f11714 100644
--- a/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java
+++ b/services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/ApexStarterMain.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2021 Nordix Foundation.
+ *  Copyright (C) 2019-2021,2024 Nordix Foundation.
  *  Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
  *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
  * ================================================================================
@@ -128,7 +128,7 @@ public class ApexStarterMain {
                     activator.terminate();
                 }
             } catch (final ApexStarterException e) {
-                LOGGER.warn("error occured during shut down of the apex starter service", e);
+                LOGGER.warn("error occurred during shut down of the apex starter service", e);
             }
         }
     }
diff --git a/services/services-onappf/src/main/resources/config/OnapPfConfig.json b/services/services-onappf/src/main/resources/config/OnapPfConfig.json
index c0a4a950f..2d4a4ec26 100644
--- a/services/services-onappf/src/main/resources/config/OnapPfConfig.json
+++ b/services/services-onappf/src/main/resources/config/OnapPfConfig.json
@@ -26,14 +26,14 @@
     },
     "topicParameterGroup": {
         "topicSources" : [{
-            "topic" : "POLICY-PDP-PAP",
-            "servers" : [ "message-router" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topic" : "policy-pdp-pap",
+            "servers" : [ "localhost" ],
+            "topicCommInfrastructure" : "NOOP"
         }],
         "topicSinks" : [{
-            "topic" : "POLICY-PDP-PAP",
-            "servers" : [ "message-router" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topic" : "policy-pdp-pap",
+            "servers" : [ "localhost" ],
+            "topicCommInfrastructure" : "NOOP"
         }]
     }
 }
diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/CommonTestData.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/CommonTestData.java
index b81295da1..f227acc6c 100644
--- a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/CommonTestData.java
+++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/parameters/CommonTestData.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019, 2023 Nordix Foundation.
+ *  Copyright (C) 2019, 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.
@@ -78,7 +78,7 @@ public class CommonTestData {
         final TopicParameters topicParams = new TopicParameters();
         topicParams.setTopic("policy-pdp-pap");
         topicParams.setTopicCommInfrastructure("noop");
-        topicParams.setServers(List.of("message-router"));
+        topicParams.setServers(List.of("localhost"));
         return topicParams;
     }
 
diff --git a/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json b/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json
index 033e75d0d..0939da3cd 100644
--- a/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json
+++ b/services/services-onappf/src/test/resources/ApexStarterConfigParameters.json
@@ -29,26 +29,26 @@
             "servers" : [ "my-server" ],
             "topicCommInfrastructure" : "ueb"
         },{
-            "topic" : "POLICY-PDP-PAP1",
-            "servers" : [ "message-router1, message-router2" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topic" : "policy-pdp-pap1",
+            "servers" : [ "kafka1, kafka2" ],
+            "topicCommInfrastructure" : "noop"
         },{
-            "topic" : "POLICY-PDP-PAP2",
-            "servers" : [ "message-router2, message-router3" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topic" : "policy-pdp-pap2",
+            "servers" : [ "kafka2, kafka3" ],
+            "topicCommInfrastructure" : "noop"
         }],
         "topicSinks" : [ {
             "topic" : "ueb-sink",
             "servers" : [ "my-server" ],
             "topicCommInfrastructure" : "ueb"
         },{
-            "topic" : "POLICY-PDP-PAP2",
-            "servers" : [ "message-router1, message-router2" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topic" : "policy-pdp-pap2",
+            "servers" : [ "kafka1, kafka2" ],
+            "topicCommInfrastructure" : "noop"
         },{
-            "topic" : "POLICY-PDP-PAP3",
-            "servers" : [ "message-router2, message-router3" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topic" : "policy-pdp-pap3",
+            "servers" : [ "kafka2, kafka3" ],
+            "topicCommInfrastructure" : "noop"
         }]
     }
 }
\ No newline at end of file
diff --git a/services/services-onappf/src/test/resources/ApexStarterConfigParameters_sim.json b/services/services-onappf/src/test/resources/ApexStarterConfigParameters_sim.json
index 9686f91a2..7aff1df6c 100644
--- a/services/services-onappf/src/test/resources/ApexStarterConfigParameters_sim.json
+++ b/services/services-onappf/src/test/resources/ApexStarterConfigParameters_sim.json
@@ -25,14 +25,14 @@
     },
     "topicParameterGroup": {
         "topicSources" : [{
-            "topic" : "POLICY-PDP-PAP",
+            "topic" : "policy-pdp-pap",
             "servers" : [ "localhost:6845" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topicCommInfrastructure" : "noop"
         }],
         "topicSinks" : [{
-            "topic" : "POLICY-PDP-PAP",
+            "topic" : "policy-pdp-pap",
             "servers" : [ "localhost:6845" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topicCommInfrastructure" : "noop"
         }]
     }
 }
\ No newline at end of file
diff --git a/services/services-onappf/src/test/resources/TestConfigParameters.json b/services/services-onappf/src/test/resources/TestConfigParameters.json
index 033e75d0d..79161ad1f 100644
--- a/services/services-onappf/src/test/resources/TestConfigParameters.json
+++ b/services/services-onappf/src/test/resources/TestConfigParameters.json
@@ -30,25 +30,25 @@
             "topicCommInfrastructure" : "ueb"
         },{
             "topic" : "POLICY-PDP-PAP1",
-            "servers" : [ "message-router1, message-router2" ],
-            "topicCommInfrastructure" : "dmaap"
+            "servers" : [ "kafka1, kafka2" ],
+            "topicCommInfrastructure" : "noop"
         },{
-            "topic" : "POLICY-PDP-PAP2",
-            "servers" : [ "message-router2, message-router3" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topic" : "policy-pdp-pap2",
+            "servers" : [ "kafka2, kafka3" ],
+            "topicCommInfrastructure" : "noop"
         }],
         "topicSinks" : [ {
             "topic" : "ueb-sink",
             "servers" : [ "my-server" ],
             "topicCommInfrastructure" : "ueb"
         },{
-            "topic" : "POLICY-PDP-PAP2",
-            "servers" : [ "message-router1, message-router2" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topic" : "policy-pdp-pap2",
+            "servers" : [ "kafka1, kafka2" ],
+            "topicCommInfrastructure" : "noop"
         },{
-            "topic" : "POLICY-PDP-PAP3",
-            "servers" : [ "message-router2, message-router3" ],
-            "topicCommInfrastructure" : "dmaap"
+            "topic" : "policy-pdp-pap3",
+            "servers" : [ "kafka2, kafka3" ],
+            "topicCommInfrastructure" : "noop"
         }]
     }
 }
\ No newline at end of file