Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 809: Enhancements to the toaster example"
[controller.git]
/
opendaylight
/
netconf
/
netconf-mapping-api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
mapping
/
api
/
HandlingPriority.java
diff --git
a/opendaylight/netconf/netconf-mapping-api/src/main/java/org/opendaylight/controller/netconf/mapping/api/HandlingPriority.java
b/opendaylight/netconf/netconf-mapping-api/src/main/java/org/opendaylight/controller/netconf/mapping/api/HandlingPriority.java
index c08db906df51a00b5dc39d53bb30be252381b3ca..1f7eed250f5b61725ee32c01aa2b1ce1a3c46f37 100644
(file)
--- a/
opendaylight/netconf/netconf-mapping-api/src/main/java/org/opendaylight/controller/netconf/mapping/api/HandlingPriority.java
+++ b/
opendaylight/netconf/netconf-mapping-api/src/main/java/org/opendaylight/controller/netconf/mapping/api/HandlingPriority.java
@@
-8,6
+8,7
@@
package org.opendaylight.controller.netconf.mapping.api;
package org.opendaylight.controller.netconf.mapping.api;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
@@
-51,13
+52,13
@@
public final class HandlingPriority implements Comparable<HandlingPriority> {
@Override
public int compareTo(HandlingPriority o) {
@Override
public int compareTo(HandlingPriority o) {
- if (this == o){
+ if (this == o)
{
return 0;
}
return 0;
}
- if (
this.equals(CANNOT_HANDLE))
{
+ if (
isCannotHandle())
{
return -1;
}
return -1;
}
- if (o.
equals(CANNOT_HANDLE))
{
+ if (o.
isCannotHandle())
{
return 1;
}
return 1;
}
@@
-70,7
+71,8
@@
public final class HandlingPriority implements Comparable<HandlingPriority> {
if (priority < o.priority){
return -1;
}
if (priority < o.priority){
return -1;
}
- throw new IllegalStateException("Unexpected state");
+
+ throw new IllegalStateException("Unexpected state comparing " + this + " with " + o);
}
@Override
}
@Override
@@
-95,4
+97,11
@@
public final class HandlingPriority implements Comparable<HandlingPriority> {
public int hashCode() {
return priority != null ? priority.hashCode() : 0;
}
public int hashCode() {
return priority != null ? priority.hashCode() : 0;
}
+
+ @Override
+ public String toString() {
+ return Objects.toStringHelper(this)
+ .add("priority", priority)
+ .toString();
+ }
}
}