X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcore%2FPath.java;h=e21f6f14720d9d510d72cf65ccc7ed1159acae14;hb=8bcd39b0fdd03d1ebbc46118d3ae4f2ee096b012;hp=5584cd9461abc54d3e79a5c57737f576c0b9e816;hpb=42210c03b0a4c54706320ba9f55794c0abd4d201;p=controller.git diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java index 5584cd9461..e21f6f1472 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Path.java @@ -11,7 +11,7 @@ * @file Path.java * * @brief Describe a path as a sequence of Edge such that from - * each of its Tail Node there is an link to the next Head Node in the sequence + * each of its Head Node there is an link to the next Tail Node in the sequence * */ package org.opendaylight.controller.sal.core; @@ -19,17 +19,15 @@ package org.opendaylight.controller.sal.core; import java.io.Serializable; import java.util.LinkedList; import java.util.List; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.EqualsBuilder; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; /** * Describe a path as a sequence of Edge such that from - * each of its Tail Node there is an link to the next Head Node in the + * each of its Head Node there is an link to the next Tail Node in the * sequence * */ @@ -50,15 +48,15 @@ public class Path implements Serializable { /** * Construct an object representing a path, the constructor will * check if the passed list of edges is such that for every - * consecutive edges the tailnode of the first edge coincide with - * the head node of the subsequent in order for connectivity to be there. + * consecutive edges the head node of the first edge coincide with + * the tail node of the subsequent in order for connectivity to be there. * * @param edges Edges of the path * */ public Path(List edges) throws ConstructionException { - // Lets check if the list of edges is such that the tail node - // of an edge is also the head node of the subsequent one + // Lets check if the list of edges is such that the head node + // of an edge is also the tail node of the subsequent one boolean sequential = true; if (edges.size() >= 2) { for (int i = 0; i < edges.size() - 1; i++) { @@ -129,12 +127,27 @@ public class Path implements Serializable { @Override public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); + final int prime = 31; + int result = 1; + result = prime * result + ((edges == null) ? 0 : edges.hashCode()); + return result; } @Override public boolean equals(Object obj) { - return EqualsBuilder.reflectionEquals(this, obj); + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Path other = (Path) obj; + if (edges == null) { + if (other.edges != null) + return false; + } else if (!edges.equals(other.edges)) + return false; + return true; } @Override