X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FRegisterChangeListener.java;h=f5d86984755beada93ae5ec6406545c7e74ee89d;hb=8ec73bf853a9b6708b455c0321a585992e02b125;hp=dea085153bbc202f7da357d71f1bfbe1aaaecd27;hpb=5adfd98dac66cab656090d1b51324b4d09573bd9;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterChangeListener.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterChangeListener.java
index dea085153b..f5d8698475 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterChangeListener.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterChangeListener.java
@@ -9,57 +9,40 @@
 package org.opendaylight.controller.cluster.datastore.messages;
 
 import akka.actor.ActorPath;
-import akka.actor.ActorSystem;
-import org.opendaylight.controller.cluster.datastore.util.InstanceIdentifierUtils;
+import akka.actor.ActorRef;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
-import org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
-public class RegisterChangeListener implements SerializableMessage {
-    public static final Class<ListenerRegistrationMessages.RegisterChangeListener> SERIALIZABLE_CLASS =
-            ListenerRegistrationMessages.RegisterChangeListener.class;
-
+public class RegisterChangeListener implements ListenerRegistrationMessage {
     private final YangInstanceIdentifier path;
-    private final ActorPath dataChangeListenerPath;
+    private final ActorRef dataChangeListener;
     private final AsyncDataBroker.DataChangeScope scope;
-
+    private final boolean registerOnAllInstances;
 
     public RegisterChangeListener(YangInstanceIdentifier path,
-        ActorPath dataChangeListenerPath,
-        AsyncDataBroker.DataChangeScope scope) {
+        ActorRef dataChangeListener,
+        AsyncDataBroker.DataChangeScope scope, boolean registerOnAllInstances) {
         this.path = path;
-        this.dataChangeListenerPath = dataChangeListenerPath;
+        this.dataChangeListener = dataChangeListener;
         this.scope = scope;
+        this.registerOnAllInstances = registerOnAllInstances;
     }
 
+    @Override
     public YangInstanceIdentifier getPath() {
         return path;
     }
 
-
     public AsyncDataBroker.DataChangeScope getScope() {
         return scope;
     }
 
     public ActorPath getDataChangeListenerPath() {
-        return dataChangeListenerPath;
+        return dataChangeListener.path();
     }
 
-
     @Override
-    public ListenerRegistrationMessages.RegisterChangeListener toSerializable() {
-      return ListenerRegistrationMessages.RegisterChangeListener.newBuilder()
-          .setInstanceIdentifierPath(InstanceIdentifierUtils.toSerializable(path))
-          .setDataChangeListenerActorPath(dataChangeListenerPath.toString())
-          .setDataChangeScope(scope.ordinal()).build();
+    public boolean isRegisterOnAllInstances() {
+        return registerOnAllInstances;
     }
-
-  public static RegisterChangeListener fromSerializable(ActorSystem actorSystem,Object serializable){
-    ListenerRegistrationMessages.RegisterChangeListener o = (ListenerRegistrationMessages.RegisterChangeListener) serializable;
-    return new RegisterChangeListener(InstanceIdentifierUtils.fromSerializable(o.getInstanceIdentifierPath()),
-                                                actorSystem.actorFor(o.getDataChangeListenerActorPath()).path(),
-                                              AsyncDataBroker.DataChangeScope.values()[o.getDataChangeScope()]);
-  }
-
-
 }