Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove use of thread-local input
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
messages
/
RegisterDataTreeChangeListener.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterDataTreeChangeListener.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterDataTreeChangeListener.java
index 2741ca0b1da73315535983dd8e85fc52aea67458..cbe9dbf5d041782135102c516d60c8b1f355b63a 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterDataTreeChangeListener.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterDataTreeChangeListener.java
@@
-7,8
+7,10
@@
*/
package org.opendaylight.controller.cluster.datastore.messages;
*/
package org.opendaylight.controller.cluster.datastore.messages;
+import static java.util.Objects.requireNonNull;
+
+import akka.actor.ActorPath;
import akka.actor.ActorRef;
import akka.actor.ActorRef;
-import com.google.common.base.Preconditions;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@
-20,29
+22,32
@@
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
* Request a {@link org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener} registration be made on the
* shard leader.
*/
* Request a {@link org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener} registration be made on the
* shard leader.
*/
-public final class RegisterDataTreeChangeListener implements Externalizable
, ListenerRegistrationMessage
{
+public final class RegisterDataTreeChangeListener implements Externalizable {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
+
private ActorRef dataTreeChangeListenerPath;
private YangInstanceIdentifier path;
private boolean registerOnAllInstances;
private ActorRef dataTreeChangeListenerPath;
private YangInstanceIdentifier path;
private boolean registerOnAllInstances;
+ public RegisterDataTreeChangeListener() {
+ // For Externalizable
+ }
+
public RegisterDataTreeChangeListener(final YangInstanceIdentifier path, final ActorRef dataTreeChangeListenerPath,
final boolean registerOnAllInstances) {
public RegisterDataTreeChangeListener(final YangInstanceIdentifier path, final ActorRef dataTreeChangeListenerPath,
final boolean registerOnAllInstances) {
- this.path =
Preconditions.checkNot
Null(path);
- this.dataTreeChangeListenerPath =
Preconditions.checkNot
Null(dataTreeChangeListenerPath);
+ this.path =
requireNon
Null(path);
+ this.dataTreeChangeListenerPath =
requireNon
Null(dataTreeChangeListenerPath);
this.registerOnAllInstances = registerOnAllInstances;
}
this.registerOnAllInstances = registerOnAllInstances;
}
- @Override
public YangInstanceIdentifier getPath() {
return path;
}
public YangInstanceIdentifier getPath() {
return path;
}
- public Actor
Ref getDataTreeChangeListene
rPath() {
- return dataTreeChangeListenerPath;
+ public Actor
Path getListenerActo
rPath() {
+ return dataTreeChangeListenerPath
.path()
;
}
}
- @Override
public boolean isRegisterOnAllInstances() {
return registerOnAllInstances;
}
public boolean isRegisterOnAllInstances() {
return registerOnAllInstances;
}
@@
-50,14
+55,20
@@
public final class RegisterDataTreeChangeListener implements Externalizable, Lis
@Override
public void writeExternal(final ObjectOutput out) throws IOException {
out.writeObject(dataTreeChangeListenerPath);
@Override
public void writeExternal(final ObjectOutput out) throws IOException {
out.writeObject(dataTreeChangeListenerPath);
- SerializationUtils.
serializePath(path, out
);
+ SerializationUtils.
writePath(out, path
);
out.writeBoolean(registerOnAllInstances);
}
@Override
public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
dataTreeChangeListenerPath = (ActorRef) in.readObject();
out.writeBoolean(registerOnAllInstances);
}
@Override
public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
dataTreeChangeListenerPath = (ActorRef) in.readObject();
- path = SerializationUtils.
deserialize
Path(in);
+ path = SerializationUtils.
read
Path(in);
registerOnAllInstances = in.readBoolean();
}
registerOnAllInstances = in.readBoolean();
}
+
+ @Override
+ public String toString() {
+ return "RegisterDataTreeChangeListener [path=" + path + ", registerOnAllInstances=" + registerOnAllInstances
+ + ", dataTreeChangeListenerPath=" + dataTreeChangeListenerPath + "]";
+ }
}
}