Enable checkstyle rule to check for boolean simplifications
Enable the checkstyle "SimplifyBooleanExpression" rule and
fix any violations it reports.
Change-Id: If8a0226829da3339b9209324a8ea36a28f2138c4
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 e370fdf..3c51c90 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/Ptree.java
@@ -37,14 +37,14 @@
while (node != null
&& node.keyBits <= keyBits
- && key_match(node.key, node.keyBits, key, keyBits) == true) {
+ && key_match(node.key, node.keyBits, key, keyBits)) {
if (node.keyBits == keyBits) {
return addReference(node);
}
match = node;
- if (bit_check(key, node.keyBits) == true) {
+ if (bit_check(key, node.keyBits)) {
node = node.right;
} else {
node = node.left;
@@ -91,12 +91,12 @@
while (node != null
&& node.keyBits <= keyBits
- && key_match(node.key, node.keyBits, key, keyBits) == true) {
+ && key_match(node.key, node.keyBits, key, keyBits)) {
if (node.keyBits == keyBits) {
return addReference(node);
}
- if (bit_check(key, node.keyBits) == true) {
+ if (bit_check(key, node.keyBits)) {
node = node.right;
} else {
node = node.left;
@@ -116,10 +116,10 @@
while (node != null
&& node.keyBits <= keyBits
- && key_match(node.key, node.keyBits, key, keyBits) == true) {
+ && key_match(node.key, node.keyBits, key, keyBits)) {
matched = node;
- if (bit_check(key, node.keyBits) == true) {
+ if (bit_check(key, node.keyBits)) {
node = node.right;
} else {
node = node.left;
@@ -230,7 +230,7 @@
private void node_link(PtreeNode node, PtreeNode add) {
boolean bit = bit_check(add.key, node.keyBits);
- if (bit == true) {
+ if (bit) {
node.right = add;
} else {
node.left = add;
diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index 77703e5..08a68b6 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -386,7 +386,7 @@
}
}
- if (isflowEntryForThisSwitch == false) {
+ if (!isflowEntryForThisSwitch) {
// If we don't find a flow entry for that switch, then we're
// in the middle of a rerouting (or something's gone wrong).
// This packet will be dropped as a victim of the rerouting.