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-2329 Add test for anyxmls inside rpc resonse for netcfon-connector"
[controller.git]
/
opendaylight
/
hosttracker
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
hosttracker
/
hostAware
/
HostNodeConnector.java
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 5d52e24c16f3dd82e998459f328689b64b8a6944..f3f86a56e2b16f70441a0794a88b957f4fae9015 100644
(file)
--- 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
@@
-8,7
+8,6
@@
package org.opendaylight.controller.hosttracker.hostAware;
package org.opendaylight.controller.hosttracker.hostAware;
-import java.io.Serializable;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
@@
-27,7
+26,7
@@
import org.opendaylight.controller.sal.packet.address.EthernetAddress;
@XmlRootElement(name = "host")
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement(name = "host")
@XmlAccessorType(XmlAccessType.NONE)
-public class HostNodeConnector extends Host
implements Serializable
{
+public class HostNodeConnector extends Host {
private static final long serialVersionUID = 1L;
@XmlElement
private NodeConnector nodeConnector;
private static final long serialVersionUID = 1L;
@XmlElement
private NodeConnector nodeConnector;
@@
-136,22
+135,29
@@
public class HostNodeConnector extends Host implements Serializable {
@Override
public boolean equals(Object obj) {
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj)
{
return true;
return true;
- if (!super.equals(obj))
+ }
+ if (!super.equals(obj)) {
return false;
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
return false;
+ }
HostNodeConnector other = (HostNodeConnector) obj;
if (nodeConnector == null) {
HostNodeConnector other = (HostNodeConnector) obj;
if (nodeConnector == null) {
- if (other.nodeConnector != null)
+ if (other.nodeConnector != null)
{
return false;
return false;
- } else if (!nodeConnector.equals(other.nodeConnector))
+ }
+ } else if (!nodeConnector.equals(other.nodeConnector)) {
return false;
return false;
- if (staticHost != other.staticHost)
+ }
+ if (staticHost != other.staticHost) {
return false;
return false;
- if (vlan != other.vlan)
+ }
+ if (vlan != other.vlan) {
return false;
return false;
+ }
return true;
}
return true;
}
@@
-167,8
+173,9
@@
public class HostNodeConnector extends Host implements Serializable {
EthernetAddress e = (EthernetAddress) getDataLayerAddress();
macaddr = e.getValue();
}
EthernetAddress e = (EthernetAddress) getDataLayerAddress();
macaddr = e.getValue();
}
- if (macaddr == null)
+ if (macaddr == null)
{
return false;
return false;
+ }
return !Arrays.equals(emptyArray, macaddr);
}
return !Arrays.equals(emptyArray, macaddr);
}