X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-restconf-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fbroker%2Fevent%2FRemoteDataChangeEvent.java;fp=opendaylight%2Fmd-sal%2Fsal-restconf-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fbroker%2Fevent%2FRemoteDataChangeEvent.java;h=9dfd262da2a99c55f899ea9b615ed9e911f5fa89;hp=5fad76ff0831e089216337321ffaf57ed1d62989;hb=2360c06ec47235dff72d480292cc50abebcea418;hpb=04d9063615080acf6c7ac49221361cea6f502a5e

diff --git a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/event/RemoteDataChangeEvent.java b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/event/RemoteDataChangeEvent.java
index 5fad76ff08..9dfd262da2 100644
--- a/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/event/RemoteDataChangeEvent.java
+++ b/opendaylight/md-sal/sal-restconf-broker/src/main/java/org/opendaylight/controller/sal/restconf/broker/event/RemoteDataChangeEvent.java
@@ -7,24 +7,79 @@
  */
 package org.opendaylight.controller.sal.restconf.broker.event;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
+import javax.annotation.concurrent.ThreadSafe;
+
 import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.DataChangedNotification;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+@ThreadSafe
 public class RemoteDataChangeEvent implements DataChangeEvent<InstanceIdentifier<? extends DataObject>,DataObject> {
-
-
-    private final DataChangedNotification dataChangedNotification;
-
-
-    public RemoteDataChangeEvent(DataChangedNotification dataChangedNotification){
-
-        this.dataChangedNotification = dataChangedNotification;
+    private final Map<InstanceIdentifier<?>, DataObject> createdConfig, createdOper, origConfig, origOper, updatedConfig, updatedOper;
+    private final Set<InstanceIdentifier<?>> removedConfig, removedOper;
+
+    public RemoteDataChangeEvent(DataChangedNotification dataChangedNotification) {
+        final Map<InstanceIdentifier<?>, DataObject> createdConfig = new HashMap<>();
+        final Map<InstanceIdentifier<?>, DataObject> createdOper = new HashMap<>();
+        final Map<InstanceIdentifier<?>, DataObject> origConfig = new HashMap<>();
+        final Map<InstanceIdentifier<?>, DataObject> origOper = new HashMap<>();
+        final Map<InstanceIdentifier<?>, DataObject> updatedConfig = new HashMap<>();
+        final Map<InstanceIdentifier<?>, DataObject> updatedOper = new HashMap<>();
+        final Set<InstanceIdentifier<?>> removedConfig = new HashSet<>();
+        final Set<InstanceIdentifier<?>> removedOper = new HashSet<>();
+
+        for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.data.changed.notification.DataChangeEvent d :dataChangedNotification.getDataChangeEvent()) {
+            switch (d.getOperation()) {
+            case Created:
+                switch (d.getStore()) {
+                case Config:
+                    createdConfig.put(d.getPath(), d);
+                    break;
+                case Operation:
+                    createdOper.put(d.getPath(), d);
+                    break;
+                }
+                break;
+            case Deleted:
+                switch (d.getStore()) {
+                case Config:
+                    removedConfig.add(d.getPath());
+                    break;
+                case Operation:
+                    removedOper.add(d.getPath());
+                    break;
+                }
+                break;
+            case Updated:
+                switch (d.getStore()) {
+                case Config:
+                    origConfig.put(d.getPath(), d);
+                    updatedConfig.put(d.getPath(), d);
+                    break;
+                case Operation:
+                    origOper.put(d.getPath(),d);
+                    updatedOper.put(d.getPath(),d);
+                    break;
+                }
+                break;
+            }
+        }
+
+        this.createdConfig = Collections.unmodifiableMap(createdConfig);
+        this.createdOper = Collections.unmodifiableMap(createdOper);
+        this.origConfig = Collections.unmodifiableMap(origConfig);
+        this.origOper = Collections.unmodifiableMap(origOper);
+        this.updatedConfig = Collections.unmodifiableMap(updatedConfig);
+        this.updatedOper = Collections.unmodifiableMap(updatedOper);
+        this.removedConfig = Collections.unmodifiableSet(removedConfig);
+        this.removedOper = Collections.unmodifiableSet(removedOper);
     }
 
     @Override
@@ -49,89 +104,41 @@ public class RemoteDataChangeEvent implements DataChangeEvent<InstanceIdentifier
 
     @Override
     public Map<InstanceIdentifier<?>, DataObject> getCreatedOperationalData() {
-        return new HashMap<InstanceIdentifier<?>, DataObject>(){{
-            for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.data.changed.notification.DataChangeEvent d :dataChangedNotification.getDataChangeEvent()){
-                if (d.getOperation().getIntValue() == 0 && d.getStore().getIntValue() == 1){
-                    put(d.getPath(),d);
-                }
-            }
-        }};
+        return createdOper;
     }
 
     @Override
     public Map<InstanceIdentifier<?>, DataObject> getCreatedConfigurationData() {
-        return new HashMap<InstanceIdentifier<?>, DataObject>(){{
-            for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.data.changed.notification.DataChangeEvent d :dataChangedNotification.getDataChangeEvent()){
-                if (d.getOperation().getIntValue() == 0 && d.getStore().getIntValue() == 0){
-                    put(d.getPath(),d);
-                }
-            }
-        }};
+        return createdConfig;
     }
 
     @Override
     public Map<InstanceIdentifier<?>, DataObject> getUpdatedOperationalData() {
-        return new HashMap<InstanceIdentifier<?>, DataObject>(){{
-            for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.data.changed.notification.DataChangeEvent d :dataChangedNotification.getDataChangeEvent()){
-                if (d.getOperation().getIntValue() == 1 && d.getStore().getIntValue() == 1){
-                    put(d.getPath(),d);
-                }
-            }
-        }};
+        return updatedOper;
     }
 
     @Override
     public Map<InstanceIdentifier<?>, DataObject> getUpdatedConfigurationData() {
-        return new HashMap<InstanceIdentifier<?>, DataObject>(){{
-            for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.data.changed.notification.DataChangeEvent d :dataChangedNotification.getDataChangeEvent()){
-                if (d.getOperation().getIntValue() == 1 && d.getStore().getIntValue() == 0){
-                    put(d.getPath(),d);
-                }
-            }
-        }};
+        return updatedConfig;
     }
 
     @Override
     public Set<InstanceIdentifier<?>> getRemovedConfigurationData() {
-        return new HashSet<InstanceIdentifier<?>>(){{
-            for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.data.changed.notification.DataChangeEvent d :dataChangedNotification.getDataChangeEvent()){
-                if (d.getOperation().getIntValue() == 2 && d.getStore().getIntValue() == 0){
-                    add(d.getPath());
-                }
-            }
-        }};
+        return removedConfig;
     }
 
     @Override
     public Set<InstanceIdentifier<?>> getRemovedOperationalData() {
-        return new HashSet<InstanceIdentifier<?>>(){{
-            for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.data.changed.notification.DataChangeEvent d :dataChangedNotification.getDataChangeEvent()){
-                if (d.getOperation().getIntValue() == 2 && d.getStore().getIntValue() == 1){
-                    add(d.getPath());
-                }
-            }
-        }};
+        return removedOper;
     }
 
     @Override
     public Map<InstanceIdentifier<?>, DataObject> getOriginalConfigurationData() {
-        return new HashMap<InstanceIdentifier<?>, DataObject>(){{
-            for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.data.changed.notification.DataChangeEvent d :dataChangedNotification.getDataChangeEvent()){
-                if (d.getOperation().getIntValue() == 1 && d.getStore().getIntValue() == 0){
-                    put(d.getPath(),d);
-                }
-            }
-        }};
+        return origConfig;
     }
 
     @Override
     public Map<InstanceIdentifier<?>, DataObject> getOriginalOperationalData() {
-        return new HashMap<InstanceIdentifier<?>, DataObject>(){{
-            for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.remote.rev140114.data.changed.notification.DataChangeEvent d :dataChangedNotification.getDataChangeEvent()){
-                if (d.getOperation().getIntValue() == 1 && d.getStore().getIntValue() == 1){
-                    put(d.getPath(),d);
-                }
-            }
-        }};
+        return origOper;
     }
 }