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 netconf from commons/opendaylight pom
[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 1236138e6c6437a181b11425ac0f2f0449930944..0f5de553aa22c45a87fdf8ec21d5e49ea55a0b9e 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,10
+8,11
@@
package org.opendaylight.controller.netconf.mapping.api;
package org.opendaylight.controller.netconf.mapping.api;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-public class HandlingPriority implements Comparable<HandlingPriority> {
+public
final
class HandlingPriority implements Comparable<HandlingPriority> {
public static final HandlingPriority CANNOT_HANDLE = new HandlingPriority();
public static final HandlingPriority HANDLE_WITH_DEFAULT_PRIORITY = new HandlingPriority(Integer.MIN_VALUE);
public static final HandlingPriority CANNOT_HANDLE = new HandlingPriority();
public static final HandlingPriority HANDLE_WITH_DEFAULT_PRIORITY = new HandlingPriority(Integer.MIN_VALUE);
@@
-45,36
+46,49
@@
public class HandlingPriority implements Comparable<HandlingPriority> {
return getHandlingPriority(priority + priorityIncrease);
}
return getHandlingPriority(priority + priorityIncrease);
}
+ public boolean isCannotHandle() {
+ return this.equals(CANNOT_HANDLE);
+ }
+
@Override
public int compareTo(HandlingPriority o) {
@Override
public int compareTo(HandlingPriority o) {
- if (this == o)
+ if (this == o)
{
return 0;
return 0;
- if (this == CANNOT_HANDLE)
+ }
+ if (isCannotHandle()) {
return -1;
return -1;
- if (o == CANNOT_HANDLE)
+ }
+ if (o.isCannotHandle()) {
return 1;
return 1;
+ }
- if (priority > o.priority)
+ if (priority > o.priority)
{
return 1;
return 1;
- if (priority == o.priority)
+ }
+ if (priority.equals(o.priority)){
return 0;
return 0;
- if (priority < o.priority)
+ }
+ if (priority < o.priority){
return -1;
return -1;
+ }
- throw new IllegalStateException("Unexpected state
"
);
+ throw new IllegalStateException("Unexpected state
comparing " + this + " with " + o
);
}
@Override
public boolean equals(Object o) {
}
@Override
public boolean equals(Object o) {
- if (this == o)
+ if (this == o)
{
return true;
return true;
- if (!(o instanceof HandlingPriority))
+ }
+ if (!(o instanceof HandlingPriority)){
return false;
return false;
+ }
HandlingPriority that = (HandlingPriority) o;
HandlingPriority that = (HandlingPriority) o;
- if (priority != null ? !priority.equals(that.priority) : that.priority != null)
+ if (priority != null ? !priority.equals(that.priority) : that.priority != null)
{
return false;
return false;
+ }
return true;
}
return true;
}
@@
-83,4
+97,11
@@
public 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 MoreObjects.toStringHelper(this)
+ .add("priority", priority)
+ .toString();
+ }
}
}