commit 4014e13da6f238ab62e5814d91fb62e439e72990
author Jian Li <pyguni@gmail.com> Fri Feb 24 20:18:59 2017 +0900
committer Jian Li <pyguni@gmail.com> Mon Feb 27 09:01:02 2017 +0000
tree b481a9c4bc7710c75c67594a6b8ee72926a7b1f6
parent cc169f3b83dc419a5ba2bf5c6811c4d1f5c66db0

Further simplify equals method by refactor if-else statement

Change-Id: I2a97dfa54916d94600e36d7e2b933fa087a1ddbe

apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/DropMappingAction.java

diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/DropMappingAction.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/DropMappingAction.java
index c38b57a..dc0af09 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/DropMappingAction.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/DropMappingAction.java
@@ -45,12 +45,6 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof DropMappingAction) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof DropMappingAction;
     }
 }

apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/ForwardMappingAction.java

diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/ForwardMappingAction.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/ForwardMappingAction.java
index 93a7150..011a3e7 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/ForwardMappingAction.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/ForwardMappingAction.java
@@ -45,12 +45,6 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof ForwardMappingAction) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof ForwardMappingAction;
     }
 }

apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NativeForwardMappingAction.java

diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NativeForwardMappingAction.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NativeForwardMappingAction.java
index a2a9a21..d1c6855 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NativeForwardMappingAction.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NativeForwardMappingAction.java
@@ -45,12 +45,6 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof NativeForwardMappingAction) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof NativeForwardMappingAction;
     }
 }

apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NoMappingAction.java

diff --git a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NoMappingAction.java b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NoMappingAction.java
index b4eb75c..fea9759 100644
--- a/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NoMappingAction.java
+++ b/apps/mappingmanagement/api/src/main/java/org/onosproject/mapping/actions/NoMappingAction.java
@@ -45,12 +45,6 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj instanceof NoMappingAction) {
-            return true;
-        }
-        return false;
+        return this == obj || obj instanceof NoMappingAction;
     }
 }