native controller generates invalid properties

Additional instrumetation and tests have been added
as well.

Issue-ID: POLICY-2489
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I65df586f3a44acf3d6f825ebfb8bd73107255a1f
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/PolicyTypeNativeDroolsController.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/PolicyTypeNativeDroolsController.java
index 9a11955a..65ed3501 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/PolicyTypeNativeDroolsController.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/PolicyTypeNativeDroolsController.java
@@ -96,7 +96,7 @@ public class PolicyTypeNativeDroolsController implements PolicyTypeController {
         try {
             controller.start();
         } catch (RuntimeException e) {
-            logger.warn("failed deploy (cannot start ontroller) for policy: {}", policy, e);
+            logger.warn("failed deploy (cannot start controller) for policy: {}", policy, e);
             PolicyEngineConstants.getManager().removePolicyController(controller);
             return false;
         }
@@ -199,7 +199,7 @@ public class PolicyTypeNativeDroolsController implements PolicyTypeController {
 
     private void configTopic(
             String configCommPrefix, String topicName, List<ControllerEvent> events, Properties controllerProps) {
-        String configTopicPrefix = configCommPrefix + "." + topicName;
+        String configTopicPrefix = configCommPrefix + ".topics." + topicName;
         configTopics(configCommPrefix, topicName, controllerProps);
         for (ControllerEvent configEvent : events) {
             configEvent(configTopicPrefix, configEvent, controllerProps);
@@ -213,7 +213,6 @@ public class PolicyTypeNativeDroolsController implements PolicyTypeController {
 
     private void configEvent(String propPrefix, ControllerEvent configEvent, Properties controllerProps) {
         String eventPropPrefix = propPrefix + ".events";
-        controllerProps.setProperty(eventPropPrefix, configEvent.getEventClass());
         if (configEvent.getEventFilter() != null) {
             controllerProps.setProperty(
                 eventPropPrefix + "." + configEvent.getEventClass() + ".filter", configEvent.getEventFilter());
@@ -225,10 +224,11 @@ public class PolicyTypeNativeDroolsController implements PolicyTypeController {
     }
 
     private void configTopicItemList(String itemPrefix, String item, Properties controllerProps) {
-        if (controllerProps.getProperty(itemPrefix) == null) {
+        String itemValue = controllerProps.getProperty(itemPrefix);
+        if (itemValue == null) {
             controllerProps.setProperty(itemPrefix, item);
         } else {
-            controllerProps.setProperty(itemPrefix, "," + item);
+            controllerProps.setProperty(itemPrefix, itemValue + "," + item);
         }
     }