Tidy routes with final classes and remove unnecessary public access

avaje-jex/src/main/java/io/avaje/jex/jdk/CtxServiceManager.java

@@ -16,7 +16,6 @@ public final class CtxServiceManager implements SpiServiceManager {
 
   private final String scheme;
   private final String contextPath;
-
   private final SpiServiceManager delegate;
 
   CtxServiceManager(SpiServiceManager delegate, String scheme, String contextPath) {

avaje-jex/src/main/java/io/avaje/jex/routes/PathParser.java

@@ -4,7 +4,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-class PathParser {
+final class PathParser {
 
   private final String rawPath;
   private final List<String> paramNames = new ArrayList<>();
@@ -33,11 +33,11 @@ class PathParser {
     this.literal = segmentCount > 1 && regBuilder.literal();
   }
 
-  public boolean matches(String url) {
+  boolean matches(String url) {
     return matchRegex.matcher(url).matches();
   }
 
-  public Map<String, String> extractPathParams(String uri) {
+  Map<String, String> extractPathParams(String uri) {
     Map<String, String> pathMap = new LinkedHashMap<>();
     final List<String> values = values(uri);
     for (int i = 0; i < values.size(); i++) {
@@ -70,28 +70,28 @@ private PathSegment parseSegment(String segment) {
   /**
    * Return the raw path that was parsed (match path).
    */
-  public String raw() {
+  String raw() {
     return rawPath;
   }
 
   /**
    * Return the number of path segments.
    */
-  public int segmentCount() {
+  int segmentCount() {
     return segmentCount;
   }
 
   /**
    * Return true if one of the segments is wildcard or slash accepting.
    */
-  public boolean multiSlash() {
+  boolean multiSlash() {
     return multiSlash;
   }
 
   /**
    * Return true if all path segments are literal.
    */
-  public boolean literal() {
+  boolean literal() {
     return literal;
   }
 }

avaje-jex/src/main/java/io/avaje/jex/routes/PathSegment.java

@@ -18,13 +18,13 @@ boolean multiSlash() {
     return false;
   }
 
-  static class SlashIgnoringParameter extends Parameter {
+  static final class SlashIgnoringParameter extends Parameter {
     SlashIgnoringParameter(String param) {
       super(param, "[^/]+?"); // Accepting everything except slash;);
     }
   }
 
-  static class SlashAcceptingParameter extends Parameter {
+  static final class SlashAcceptingParameter extends Parameter {
     SlashAcceptingParameter(String param) {
       super(param, ".+?"); // Accept everything
     }
@@ -60,7 +60,7 @@ public void addParamName(List<String> paramNames) {
     }
   }
 
-  static class Multi extends PathSegment {
+  static final class Multi extends PathSegment {
 
     private final List<PathSegment> segments;
 
@@ -93,7 +93,7 @@ void addParamName(List<String> paramNames) {
     }
   }
 
-  static class Literal extends PathSegment {
+  static final class Literal extends PathSegment {
     private final String content;
 
     Literal(String content) {
@@ -116,7 +116,7 @@ public void addParamName(List<String> paramNames) {
     }
   }
 
-  static class Wildcard extends PathSegment {
+  static final class Wildcard extends PathSegment {
 
     @Override
     boolean multiSlash() {

avaje-jex/src/main/java/io/avaje/jex/routes/PathSegmentParser.java

@@ -7,7 +7,7 @@
 
 import static java.util.stream.Collectors.toList;
 
-class PathSegmentParser {
+final class PathSegmentParser {
 
   private static final PathSegment WILDCARD = new PathSegment.Wildcard();
 

avaje-jex/src/main/java/io/avaje/jex/routes/RegBuilder.java

@@ -7,7 +7,7 @@
 /**
  * Helper for PathParser to build regex for the path.
  */
-class RegBuilder {
+final class RegBuilder {
   private final StringJoiner full = new StringJoiner("/");
   private final StringJoiner extract = new StringJoiner("/");
   private boolean trailingSlash;

avaje-jex/src/main/java/io/avaje/jex/routes/RouteEntry.java

@@ -9,7 +9,7 @@
 import io.avaje.jex.ExchangeHandler;
 import io.avaje.jex.security.Role;
 
-class RouteEntry implements SpiRoutes.Entry {
+final class RouteEntry implements SpiRoutes.Entry {
 
   private final AtomicLong active = new AtomicLong();
   private final PathParser path;

avaje-jex/src/main/java/io/avaje/jex/routes/RouteIndex.java

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-class RouteIndex {
+final class RouteIndex {
 
   /**
    * Partition entries by the number of path segments.

avaje-jex/src/main/java/io/avaje/jex/routes/RoutesBuilder.java

@@ -7,7 +7,7 @@
 import java.util.EnumMap;
 import java.util.List;
 
-public class RoutesBuilder {
+public final class RoutesBuilder {
 
   private final EnumMap<Routing.Type, RouteIndex> typeMap = new EnumMap<>(Routing.Type.class);
   private final boolean ignoreTrailingSlashes;

avaje-jex/src/main/java/io/avaje/jex/routes/UrlDecode.java

@@ -1,16 +1,13 @@
 package io.avaje.jex.routes;
 
-import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 
-public class UrlDecode {
+import static java.nio.charset.StandardCharsets.UTF_8;
 
-  public static String decode(String s) {
-    try {
-      return URLDecoder.decode(s.replace("+", "%2B"), "UTF-8").replace("%2B", "+");
-    } catch (UnsupportedEncodingException e) {
-      throw new RuntimeException("Not expected", e);
-    }
+final class UrlDecode {
+
+  static String decode(String s) {
+    return URLDecoder.decode(s.replace("+", "%2B"), UTF_8).replace("%2B", "+");
   }
 
 }