X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fhosttracker%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fhosttracker%2FhostAware%2FHostNodeConnector.java;h=e7b5745a2ec63c3fc3544d3b538e1d5188154303;hb=e3e571dbfd9bb37364502101d482b7796d6b5cea;hp=c83dc3d4089870cc020d0b6abf6fbd15e3637042;hpb=9e43cfabdc83df4c5db51ce6e22e0cecca12aa9a;p=controller.git diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java index c83dc3d408..e7b5745a2e 100644 --- a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java +++ b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java @@ -19,8 +19,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.opendaylight.controller.sal.core.ConstructionException; import org.opendaylight.controller.sal.core.Host; @@ -140,20 +138,36 @@ public class HostNodeConnector extends Host { return this; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); + final int prime = 31; + int result = super.hashCode(); + result = prime * result + + ((nodeConnector == null) ? 0 : nodeConnector.hashCode()); + result = prime * result + (staticHost ? 1231 : 1237); + result = prime * result + vlan; + return result; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ @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; + HostNodeConnector other = (HostNodeConnector) obj; + if (nodeConnector == null) { + if (other.nodeConnector != null) + return false; + } else if (!nodeConnector.equals(other.nodeConnector)) + return false; + if (staticHost != other.staticHost) + return false; + if (vlan != other.vlan) + return false; + return true; } public boolean equalsByIP(InetAddress networkAddress) {