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

---
 brouter-core/src/main/java/btools/router/OsmNogoPolygon.java   | 1 -
 brouter-server/src/main/java/btools/server/SuspectManager.java | 1 -
 brouter-util/src/main/java/btools/util/ByteDataWriter.java     | 1 -
 config/pmd/pmd-ruleset.xml                                     | 1 -
 4 files changed, 4 deletions(-)

diff --git a/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java b/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java
index 3ebd067..b033dbb 100644
--- a/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java
+++ b/brouter-core/src/main/java/btools/router/OsmNogoPolygon.java
@@ -132,7 +132,6 @@ public class OsmNogoPolygon extends OsmNodeNamed {
     ilon = cx;
     ilat = cy;
     radius = rad * 1.001 + 1.0; // ensure the outside-of-enclosing-circle test in RoutingContext.calcDistance() is not passed by segments ending very close to the radius due to limited numerical precision
-    return;
   }
 
   /**
diff --git a/brouter-server/src/main/java/btools/server/SuspectManager.java b/brouter-server/src/main/java/btools/server/SuspectManager.java
index 0486c10..27befc5 100644
--- a/brouter-server/src/main/java/btools/server/SuspectManager.java
+++ b/brouter-server/src/main/java/btools/server/SuspectManager.java
@@ -543,7 +543,6 @@ public class SuspectManager extends Thread {
     }
     bw.write("</body></html>\n");
     bw.flush();
-    return;
   }
 
 
diff --git a/brouter-util/src/main/java/btools/util/ByteDataWriter.java b/brouter-util/src/main/java/btools/util/ByteDataWriter.java
index 04e7699..0a6c305 100644
--- a/brouter-util/src/main/java/btools/util/ByteDataWriter.java
+++ b/brouter-util/src/main/java/btools/util/ByteDataWriter.java
@@ -142,7 +142,6 @@ public class ByteDataWriter extends ByteDataReader {
     ab[aboffset++] = (byte) (i7 | 0x80);
 
     ab[aboffset++] = (byte) (v);
-    return;
   }
 
   public int size() {
diff --git a/config/pmd/pmd-ruleset.xml b/config/pmd/pmd-ruleset.xml
index 775d7fe..a09ea44 100644
--- a/config/pmd/pmd-ruleset.xml
+++ b/config/pmd/pmd-ruleset.xml
@@ -39,7 +39,6 @@
         <exclude name="UncommentedEmptyMethodBody" />
         <exclude name="UnnecessaryFullyQualifiedName" />
         <exclude name="UnnecessaryModifier" />
-        <exclude name="UnnecessaryReturn" />
         <exclude name="UnusedFormalParameter" />
         <exclude name="UnusedLocalVariable" />
         <exclude name="UnusedPrivateField" />