Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 2194: Modify FindPrimary to check for leader
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
messages
/
PrimaryNotFound.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryNotFound.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryNotFound.java
index 057028c469416df2767a067ef5e36e4256babd35..b47c91b6e5802ee7896ff30ba2b7d1035d8fc338 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryNotFound.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/PrimaryNotFound.java
@@
-9,14
+9,13
@@
package org.opendaylight.controller.cluster.datastore.messages;
import com.google.common.base.Preconditions;
package org.opendaylight.controller.cluster.datastore.messages;
import com.google.common.base.Preconditions;
-import org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages;
public class PrimaryNotFound implements SerializableMessage {
public class PrimaryNotFound implements SerializableMessage {
- public static final Class
SERIALIZABLE_CLASS = ShardManagerMessages.
PrimaryNotFound.class;
+ public static final Class
<PrimaryNotFound> SERIALIZABLE_CLASS =
PrimaryNotFound.class;
private final String shardName;
private final String shardName;
- public PrimaryNotFound(String shardName){
+ public PrimaryNotFound(
final
String shardName){
Preconditions.checkNotNull(shardName, "shardName should not be null");
Preconditions.checkNotNull(shardName, "shardName should not be null");
@@
-24,13
+23,19
@@
public class PrimaryNotFound implements SerializableMessage {
}
@Override
}
@Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
PrimaryNotFound that = (PrimaryNotFound) o;
PrimaryNotFound that = (PrimaryNotFound) o;
- if (shardName != null ? !shardName.equals(that.shardName) : that.shardName != null) return false;
+ if (shardName != null ? !shardName.equals(that.shardName) : that.shardName != null) {
+ return false;
+ }
return true;
}
return true;
}
@@
-42,10
+47,10
@@
public class PrimaryNotFound implements SerializableMessage {
@Override
public Object toSerializable() {
@Override
public Object toSerializable() {
- return
ShardManagerMessages.PrimaryNotFound.newBuilder().setShardName(shardName).build()
;
+ return
this
;
}
}
- public static PrimaryNotFound fromSerializable(Object message){
- return
new PrimaryNotFound(((ShardManagerMessages.PrimaryNotFound)message).getShardName())
;
+ public static PrimaryNotFound fromSerializable(
final
Object message){
+ return
(PrimaryNotFound) message
;
}
}
}
}