Merge "Fix bulk sync in SwitchMananger."

[controller.git] / opendaylight / sal / api / src / main / java / org / opendaylight / controller / sal / core / Actions.java

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java
index 832c9565a5585356a5cab10029814d1ff1e5e4b2..135a67dcd1cbfdd83a00f5695ab2d18e4833fc9d 100644 (file)
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java
@@ -12,10 +12,6 @@ package org.opendaylight.controller.sal.core;
 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.apache.commons.lang3.builder.ReflectionToStringBuilder;
-
 /**
  * @file   Actions.java
  *
@@ -26,33 +22,33 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
 @XmlRootElement
 public class Actions extends Property {
-       private static final long serialVersionUID = 1L;
+        private static final long serialVersionUID = 1L;
     @XmlElement
     private int actionsValue;
-    
-    public enum ActionType { 
-       OUTPUT_PORT_ACTION(1<<0),
-       VLAN_VID_ACTION(1<<1),
-       VLAN_PCP_ACTION(1<<2),
-       VLAN_STRIP_ACTION(1<<3),
-       DLSRC_ACTION(1<<4),
-       DLDST_ACTION(1<<5),
-       NWSRC_ACTION(1<<6),
-       NWDST_ACTION(1<<7),
-       NWTOS_ACTION(1<<8),
-       TPTSRC_ACTION(1<<9),
-       TPTDST_ACTION(1<<10),
-       ENQUEUE_ACTION(1<<11),
-       VENDOR_ACTION(0xffff);
-       private final int at;
-       ActionType(int val) {
-               this.at = val;
-       }
-       public int getValue() {
-               return at;
-       }
+
+    public enum ActionType {
+        OUTPUT_PORT_ACTION(1<<0),
+        VLAN_VID_ACTION(1<<1),
+        VLAN_PCP_ACTION(1<<2),
+        VLAN_STRIP_ACTION(1<<3),
+        DLSRC_ACTION(1<<4),
+        DLDST_ACTION(1<<5),
+        NWSRC_ACTION(1<<6),
+        NWDST_ACTION(1<<7),
+        NWTOS_ACTION(1<<8),
+        TPTSRC_ACTION(1<<9),
+        TPTDST_ACTION(1<<10),
+        ENQUEUE_ACTION(1<<11),
+        VENDOR_ACTION(0xffff);
+        private final int at;
+        ActionType(int val) {
+                this.at = val;
+        }
+        public int getValue() {
+                return at;
+        }
     }
-    
+
     public static final String ActionsPropName = "actions";
     /**
      * Construct a actions property
@@ -76,24 +72,36 @@ public class Actions extends Property {
     public Actions clone() {
         return new Actions(this.actionsValue);
     }
-    
+
     public int getValue() {
-       return this.actionsValue;
+        return this.actionsValue;
     }
-    
-    
+
+
     @Override
     public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + actionsValue;
+        return result;
     }
 
     @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;
+        Actions other = (Actions) obj;
+        if (actionsValue != other.actionsValue)
+            return false;
+        return true;
     }
 
     @Override
     public String toString() {
-        return "Actions[" + ReflectionToStringBuilder.toString(this) + "]";
+        return "Actions[" + actionsValue + "]";
     }
 }