commit 499cfae0108e022c166a7c16b61c5a8ac35fde39
author Pavlin Radoslavov <pavlin@onlab.us> Thu Apr 10 19:24:43 2014 -0700
committer Gerrit Code Review <gerrit2@onos-services> Thu Apr 10 19:24:43 2014 -0700
tree e2eb46bddd8140e76a31c1ed0eb35caad28c6be3
parent 313fdf00b5e91203317088985c85fe3f33be0f9d
parent 4985f2106cdf2455ee98a0c0bd064d0d900a8861

Merge "Enable checkstyle rule for boolean return statement that can be simplified."

conf/checkstyle/sun_checks.xml

diff --git a/conf/checkstyle/sun_checks.xml b/conf/checkstyle/sun_checks.xml
index 5baa022..db7e909 100644
--- a/conf/checkstyle/sun_checks.xml
+++ b/conf/checkstyle/sun_checks.xml
@@ -223,10 +223,7 @@
           <property name="severity" value="warning"/>
         </module>
 
-        <module name="SimplifyBooleanReturn">
-          <property name="severity" value="warning"/>
-        </module>
-
+        <module name="SimplifyBooleanReturn"/>
 
         <!-- Checks for class design                         -->
         <!-- See http://checkstyle.sf.net/config_design.html -->

src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java

diff --git a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
index c34e773..6969480 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
@@ -1287,15 +1287,10 @@
 
         if (newEntry.getSysUpTime() > oldEntry.getSysUpTime()) {
             return true;
-        } else if (newEntry.getSysUpTime() == oldEntry.getSysUpTime()) {
-            if (newEntry.getSequenceNum() > oldEntry.getSequenceNum()) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
         }
+
+        return newEntry.getSysUpTime() == oldEntry.getSysUpTime() &&
+               newEntry.getSequenceNum() > oldEntry.getSequenceNum();
     }
 
     // The code below should be reimplemented after removal of Floodlight's

src/main/java/net/onrc/onos/apps/bgproute/Ptree.java

diff --git a/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java b/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
index 3959986..e370fdf 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
@@ -224,11 +224,7 @@
 
         bit >>= shift;
 
-        if ((bit & 1) == 1) {
-            return true;
-        } else {
-            return false;
-        }
+        return ((bit & 1) == 1);
     }
 
     private void node_link(PtreeNode node, PtreeNode add) {