From 41d25cd5239fb7a48a98764b99555186a79a9c4a Mon Sep 17 00:00:00 2001
From: Manuel Fuhr <manuel@knid.net>
Date: Sun, 13 Nov 2022 16:08:15 +0100
Subject: [PATCH] Enable PMD rule SimplifyBooleanReturns and fix violations

---
 brouter-util/src/main/java/btools/util/CompactLongSet.java | 5 +----
 brouter-util/src/main/java/btools/util/FrozenLongSet.java  | 5 +----
 config/pmd/pmd-ruleset.xml                                 | 1 -
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/brouter-util/src/main/java/btools/util/CompactLongSet.java b/brouter-util/src/main/java/btools/util/CompactLongSet.java
index 8398fca..5ac8559 100644
--- a/brouter-util/src/main/java/btools/util/CompactLongSet.java
+++ b/brouter-util/src/main/java/btools/util/CompactLongSet.java
@@ -141,10 +141,7 @@ public class CompactLongSet {
         n = nn;
       }
     }
-    if (a[n] == id) {
-      return true;
-    }
-    return false;
+    return a[n] == id;
   }
 
   protected void moveToFrozenArray(long[] faid) {
diff --git a/brouter-util/src/main/java/btools/util/FrozenLongSet.java b/brouter-util/src/main/java/btools/util/FrozenLongSet.java
index 2d97b8a..bc9e967 100644
--- a/brouter-util/src/main/java/btools/util/FrozenLongSet.java
+++ b/brouter-util/src/main/java/btools/util/FrozenLongSet.java
@@ -61,10 +61,7 @@ public class FrozenLongSet extends CompactLongSet {
       }
       offset >>= 1;
     }
-    if (a[n] == id) {
-      return true;
-    }
-    return false;
+    return a[n] == id;
   }
 
 }
diff --git a/config/pmd/pmd-ruleset.xml b/config/pmd/pmd-ruleset.xml
index 8444511..1c89924 100644
--- a/config/pmd/pmd-ruleset.xml
+++ b/config/pmd/pmd-ruleset.xml
@@ -31,7 +31,6 @@
         <exclude name="PreserveStackTrace" />
         <exclude name="PrimitiveWrapperInstantiation" />
         <exclude name="ReturnEmptyCollectionRatherThanNull" />
-        <exclude name="SimplifyBooleanReturns" />
         <exclude name="UncommentedEmptyConstructor" />
         <exclude name="UncommentedEmptyMethodBody" />
         <exclude name="UnusedFormalParameter" />