Issue-ID: DCAEGEN2-1055 BBS test bug fixes

Change-Id: I43314e5e81027cfd4deef71a183d19fad4248626
Signed-off-by: s00370346 <swarup.nayak1@huawei.com>

2 files changed, 32 insertions, 2 deletions

diff --git a/src/main/java/org/onap/dcae/controller/AccessController.java b/src/main/java/org/onap/dcae/controller/AccessController.java
index c77772e..c2ed5e3 100644
--- a/src/main/java/org/onap/dcae/controller/AccessController.java
+++ b/src/main/java/org/onap/dcae/controller/AccessController.java
@@ -176,6 +176,8 @@ public class AccessController {
                                         .setEventUnSubscriptionTemplate(
                                                 event.get("event_unSubscriptionTemplate").toString())
                                         .setEventRuleId(event.get("event_ruleId").toString()).setParentCtrllr(this)
+                                        .setModifyEvent(Boolean.parseBoolean(event.get("modifyData").toString()))
+                                        .setModifyMethod(event.get("modifyMethod").toString())
                                         .createPersistentEventConnection();
 
                         eventList.put(name, conn);
diff --git a/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java b/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java
index 860c0c9..c963129 100644
--- a/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java
+++ b/src/main/java/org/onap/dcae/controller/PersistentEventConnection.java
@@ -55,7 +55,8 @@ public class PersistentEventConnection implements Runnable {
     private EventConnectionState state;
     private volatile boolean running = true;
     private static final Logger log = LoggerFactory.getLogger(PersistentEventConnection.class);
-
+    private boolean modifyEvent;
+    private String modifyMethod;
 
     private RestConfContext ctx;
     private AccessController parentCtrllr;
@@ -72,6 +73,8 @@ public class PersistentEventConnection implements Runnable {
         private String event_unSubscriptionTemplate;
         private String event_ruleId;
         private AccessController parentCtrllr;
+        private boolean modifyEvent;
+        private String modifyMethod;
 
         public PersistentEventConnectionBuilder setEventName(String event_name) {
             this.event_name = event_name;
@@ -118,9 +121,20 @@ public class PersistentEventConnection implements Runnable {
             return this;
         }
 
+        public PersistentEventConnectionBuilder setModifyEvent(boolean modifyEvent) {
+            this.modifyEvent = modifyEvent;
+            return this;
+        }
+
+        public PersistentEventConnectionBuilder setModifyMethod(String modifyMethod) {
+            this.modifyMethod = modifyMethod;
+            return this;
+        }
         public PersistentEventConnection createPersistentEventConnection() {
             return new PersistentEventConnection(this);
         }
+
+
     }
 
 
@@ -135,6 +149,8 @@ public class PersistentEventConnection implements Runnable {
             this.event_unSubscriptionTemplate = builder.event_unSubscriptionTemplate;
             this.event_ruleId = builder.event_ruleId;
             this.state = EventConnectionState.INIT;
+            this.modifyEvent = builder.modifyEvent;
+            this.modifyMethod = builder.modifyMethod;
 
             this.ctx = new RestConfContext();
             for (String s : builder.parentCtrllr.getCtx().getAttributeKeySet()) {
@@ -144,7 +160,7 @@ public class PersistentEventConnection implements Runnable {
             this.eventParaMap = new HashMap<>();
             this.eventParaMap.putAll(builder.parentCtrllr.getParaMap());
             printEventParamMap();
-            log.info("New persistent connection created " + event_name);
+            log.info("New persistent connection created " + event_name + "modify event " + modifyEvent);
 
     }
 
@@ -254,6 +270,18 @@ public class PersistentEventConnection implements Runnable {
         return eventParaMap.get(fieldName);
     }
 
+    public AccessController getParentCtrllr() {
+        return parentCtrllr;
+    }
+
+    public boolean isModifyEvent() {
+        return modifyEvent;
+    }
+
+    public String getModifyMethod() {
+        return modifyMethod;
+    }
+
     public void printEventParamMap() {
         log.info("----------------Event Param Map-------------------");
         for (String name : eventParaMap.keySet()) {