package org.opendaylight.controller.sal.match;
+import java.io.Serializable;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
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.opendaylight.controller.sal.utils.EtherTypes;
import org.opendaylight.controller.sal.utils.IPProtocols;
import org.opendaylight.controller.sal.utils.NetUtils;
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class Match implements Cloneable {
- private static final Map<MatchType, MatchType> reversableMatches;
+public class Match implements Cloneable, Serializable {
+ private static final long serialVersionUID = 1L;
+ private static final Map<MatchType, MatchType> reversableMatches;
static {
Map<MatchType, MatchType> map = new HashMap<MatchType, MatchType>();
map.put(MatchType.DL_SRC, MatchType.DL_DST);
*
* @return the 32 bit long mask (Refer to {@code}org.opendaylight.controller.sal.match.MatchElement)
*/
- @XmlElement
public int getMatches() {
return matches;
}
return new ArrayList<MatchType>(fields.keySet());
}
+ /**
+ * Returns the list of MatchFields the match is set for
+ *
+ * @return List of individual MatchField values.
+ */
+ @XmlElement(name="matchField")
+ public List<MatchField> getMatchFields() {
+ return new ArrayList<MatchField>(fields.values());
+ }
+
/**
* Returns whether this match is for an IPv6 flow
*/
&& filterAddress instanceof Inet4Address) {
return true;
}
- InetAddress thisMask = (InetAddress) filter.getField(type)
- .getMask();
- InetAddress filterMask = (InetAddress) filter.getField(type)
- .getMask();
+ InetAddress thisMask = (InetAddress) thisField.getMask();
+ InetAddress filterMask = (InetAddress) filterField.getMask();
// thisAddress has to be in same subnet of filterAddress
if (NetUtils.inetAddressConflict(thisAddress, filterAddress,
thisMask, filterMask)) {
@Override
public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((fields == null) ? 0 : fields.hashCode());
+ result = prime * result + matches;
+ 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;
+ Match other = (Match) obj;
+ if (fields == null) {
+ if (other.fields != null)
+ return false;
+ } else if (!fields.equals(other.fields))
+ return false;
+ if (matches != other.matches)
+ return false;
+ return true;
}
@Override