Enable checkstyle rule for boolean return statement
that can be simplified.
Enable the "SimplifyBooleanReturn" checkstyle rule and fix
the violations is causes.
Change-Id: I3465c76d863d49ca71895d9c8d55b86e4a37d0f1
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 -->
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
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) {