Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Make use of NetUtils.getBroadcastMacAddr()
[controller.git]
/
opendaylight
/
sal
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
core
/
Tier.java
diff --git
a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java
b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java
index 89db9aab248e367a183b232f4bb936d66831acd3..33c87db650404f9ca6b79c69e8703844ff047172 100644
(file)
--- a/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java
+++ b/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java
@@
-9,22
+9,21
@@
package org.opendaylight.controller.sal.core;
package org.opendaylight.controller.sal.core;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-
/**
* The class represents the Tier property of a node
*
*
*/
@XmlRootElement
/**
* The class represents the Tier property of a node
*
*
*/
@XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
@SuppressWarnings("serial")
public class Tier extends Property {
@SuppressWarnings("serial")
public class Tier extends Property {
- @XmlElement
+ @XmlElement
(name="value")
private int tierValue;
public static final String TierPropName = "tier";
private int tierValue;
public static final String TierPropName = "tier";
@@
-41,6
+40,7
@@
public class Tier extends Property {
this.tierValue = 0;
}
this.tierValue = 0;
}
+ @Override
public Tier clone() {
return new Tier(this.tierValue);
}
public Tier clone() {
return new Tier(this.tierValue);
}
@@
-51,16
+51,33
@@
public class Tier extends Property {
@Override
public int hashCode() {
@Override
public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result + tierValue;
+ return result;
}
@Override
public boolean equals(Object obj) {
}
@Override
public boolean equals(Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
+ if (this == obj)
+ return true;
+ if (!super.equals(obj))
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Tier other = (Tier) obj;
+ if (tierValue != other.tierValue)
+ return false;
+ return true;
}
@Override
public String toString() {
}
@Override
public String toString() {
- return "Tier[" + ReflectionToStringBuilder.toString(this) + "]";
+ return "Tier[" + tierValue + "]";
+ }
+
+ @Override
+ public String getStringValue() {
+ return String.valueOf(tierValue);
}
}
}
}