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=f3f86a56e2b16f70441a0794a88b957f4fae9015;hb=fba140bf09ffbf8694aa41f544caaa331c2ec29a;hp=5d9a5e180310bf8bb98e042201dd45e59b442dc5;hpb=7c3362df780f30a47d0f6a7b7695360bbb5513bc;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 5d9a5e1803..f3f86a56e2 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 @@ -18,7 +18,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.ReflectionToStringBuilder; import org.opendaylight.controller.sal.core.ConstructionException; import org.opendaylight.controller.sal.core.Host; import org.opendaylight.controller.sal.core.Node; @@ -35,7 +34,7 @@ public class HostNodeConnector extends Host { private short vlan; @XmlElement private boolean staticHost; - private transient short arpSendCountDown; + private short arpSendCountDown; /** * Private constructor used for JAXB mapping @@ -136,22 +135,29 @@ public class HostNodeConnector extends Host { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (!super.equals(obj)) + } + if (!super.equals(obj)) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } HostNodeConnector other = (HostNodeConnector) obj; if (nodeConnector == null) { - if (other.nodeConnector != null) + if (other.nodeConnector != null) { return false; - } else if (!nodeConnector.equals(other.nodeConnector)) + } + } else if (!nodeConnector.equals(other.nodeConnector)) { return false; - if (staticHost != other.staticHost) + } + if (staticHost != other.staticHost) { return false; - if (vlan != other.vlan) + } + if (vlan != other.vlan) { return false; + } return true; } @@ -167,8 +173,9 @@ public class HostNodeConnector extends Host { EthernetAddress e = (EthernetAddress) getDataLayerAddress(); macaddr = e.getValue(); } - if (macaddr == null) + if (macaddr == null) { return false; + } return !Arrays.equals(emptyArray, macaddr); } @@ -179,8 +186,21 @@ public class HostNodeConnector extends Host { */ @Override public String toString() { - return "HostNodeConnector[" + ReflectionToStringBuilder.toString(this) - + "]"; + StringBuilder builder = new StringBuilder(); + builder.append("HostNodeConnector ["); + if (nodeConnector != null) { + builder.append("nodeConnector=") + .append(nodeConnector) + .append(", "); + } + builder.append("vlan=") + .append(vlan) + .append(", staticHost=") + .append(staticHost) + .append(", arpSendCountDown=") + .append(arpSendCountDown) + .append("]"); + return builder.toString(); } public boolean isV4Host() {