X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fprotocol_plugins%2Fopenflow%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fprotocol_plugin%2Fopenflow%2Fvendorextension%2Fv6extension%2FV6Error.java;h=9e44073e21a2f7376def5edd8f57458b1a7b3291;hb=d0853adc639de247a097f19868cce0ccaf7c2453;hp=4f0dbd5ca55b0b621f6202a68e7488cdc4447486;hpb=9cdfa8361e3b4d3e969821aa4de5c4862e22a025;p=controller.git diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Error.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Error.java index 4f0dbd5ca5..9e44073e21 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Error.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Error.java @@ -1,28 +1,26 @@ package org.opendaylight.controller.protocol_plugin.openflow.vendorextension.v6extension; import java.nio.ByteBuffer; +import java.util.Arrays; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.openflow.protocol.OFError; public class V6Error extends OFError { - private static final long serialVersionUID = 1L; - public static int MINIMUM_LENGTH = 20;//OfHdr(8) + NXET_VENDOR(2) + NXEC_VENDOR_ERROR(2) + struct nx_vendor_error(8) - public static final short NICIRA_VENDOR_ERRORTYPE = (short)0xb0c2; - protected int V6VendorId; + private static final long serialVersionUID = 1L; + public static int MINIMUM_LENGTH = 20;//OfHdr(8) + NXET_VENDOR(2) + NXEC_VENDOR_ERROR(2) + struct nx_vendor_error(8) + public static final short NICIRA_VENDOR_ERRORTYPE = (short)0xb0c2; + protected int V6VendorId; protected short V6VendorErrorType; protected short V6VendorErrorCode; protected byte[] V6ErrorData; - + public V6Error(OFError e) { this.length = (short)e.getLengthU(); this.errorType = e.getErrorType(); this.errorCode = e.getErrorCode(); this.xid = e.getXid(); } - + @Override public void readFrom(ByteBuffer data) { this.V6VendorId = data.getInt(); @@ -32,49 +30,77 @@ public class V6Error extends OFError { if (dataLength > 0) { this.V6ErrorData = new byte[dataLength]; data.get(this.V6ErrorData); - } + } } - + /** * @return the V6VendorId */ public int getVendorId() { return V6VendorId; } - + /** * @return the V6VendorErrorType */ public short getVendorErrorType() { return V6VendorErrorType; } - + /** * @return the VendorErrorType */ public short getVendorErrorCode() { return V6VendorErrorCode; } - + /** * @return the Error Bytes */ public byte[] getError() { return V6ErrorData; } - + @Override public int hashCode() { - return HashCodeBuilder.reflectionHashCode(this); + final int prime = 31; + int result = super.hashCode(); + result = prime * result + Arrays.hashCode(V6ErrorData); + result = prime * result + V6VendorErrorCode; + result = prime * result + V6VendorErrorType; + result = prime * result + V6VendorId; + return result; } @Override public String toString() { - return "V6Error[" + ReflectionToStringBuilder.toString(this) + "]"; + return "V6Error [V6VendorId=" + V6VendorId + ", V6VendorErrorType=" + + V6VendorErrorType + ", V6VendorErrorCode=" + + V6VendorErrorCode + ", V6ErrorData=" + + Arrays.toString(V6ErrorData) + ", errorType=" + errorType + + ", errorCode=" + errorCode + ", factory=" + factory + + ", error=" + Arrays.toString(error) + ", errorIsAscii=" + + errorIsAscii + ", version=" + version + ", type=" + type + + ", length=" + length + ", xid=" + xid + "]"; } @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; + V6Error other = (V6Error) obj; + if (!Arrays.equals(V6ErrorData, other.V6ErrorData)) + return false; + if (V6VendorErrorCode != other.V6VendorErrorCode) + return false; + if (V6VendorErrorType != other.V6VendorErrorType) + return false; + if (V6VendorId != other.V6VendorId) + return false; + return true; } }