Seal Internal Classes (#12)

* seal internal classes * Google Java Format * Update README.md --------- Co-authored-by: github-actions <>
avaje · Nov 7, 2024 · 3fabc34 · 3fabc34
1 parent 1e4ed8e
commit 3fabc34
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -41,14 +41,14 @@ public class LambdaRequestHandler
 <dependency>
   <groupId>io.avaje</groupId>
   <artifactId>avaje-http-api</artifactId>
-  <version>2.8-RC3</version>
+  <version>2.8</version>
 </dependency>
 
 <!-- Annotation processor -->
 <dependency>
   <groupId>io.avaje</groupId>
   <artifactId>avaje-http-sigma-generator</artifactId>
-  <version>2.8-RC3</version>
+  <version>2.8</version>
   <scope>provided</scope>
   <optional>true</optional>
 </dependency>

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/core/DSigmaFunction.java b/avaje-sigma/src/main/java/io/avaje/sigma/core/DSigmaFunction.java
@@ -8,7 +8,7 @@
 import io.avaje.sigma.routes.SpiRoutes;
 import java.util.Map;
 
-class DSigmaFunction implements Sigma.HttpFunction {
+final class DSigmaFunction implements Sigma.HttpFunction {
 
   private final SpiRoutes routes;
   private final ServiceManager manager;

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/core/DefaultRouting.java b/avaje-sigma/src/main/java/io/avaje/sigma/core/DefaultRouting.java
@@ -12,8 +12,7 @@
 import java.util.List;
 import java.util.Map;
 
-/** */
-class DefaultRouting implements Router {
+final class DefaultRouting implements Router {
 
   private static final String SLASH = "/";
   private final List<Router.Entry> handlers = new ArrayList<>();
@@ -45,8 +44,7 @@ public Router addAll(Collection<HttpService> routes) {
   }
 
   private void add(HttpMethod verb, String path, Handler handler) {
-    Entry lastEntry;
-    lastEntry = new Entry(verb, path(path), handler);
+    Entry lastEntry = new Entry(verb, path(path), handler);
     handlers.add(lastEntry);
   }
 

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/core/ServiceManager.java b/avaje-sigma/src/main/java/io/avaje/sigma/core/ServiceManager.java
@@ -13,7 +13,7 @@
 import io.avaje.sigma.body.BodyMapper;
 
 /** Core implementation of SpiServiceManager provided to specific implementations like jetty etc. */
-class ServiceManager {
+final class ServiceManager {
 
   private final Map<String, BodyMapper> mappers;
 

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/core/SigmaContext.java b/avaje-sigma/src/main/java/io/avaje/sigma/core/SigmaContext.java
@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Map;
 
-class SigmaContext implements HttpContext {
+final class SigmaContext implements HttpContext {
 
   public static final String CONTENT_TYPE = "Content-Type";
 

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/FilterEntry.java b/avaje-sigma/src/main/java/io/avaje/sigma/routes/FilterEntry.java
@@ -6,7 +6,7 @@
 import java.util.Map;
 
 /** Filter with special matchAll. */
-class FilterEntry implements SpiRoutes.Entry {
+final class FilterEntry implements SpiRoutes.Entry {
 
   private final String path;
   private final boolean matchAll;

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/PathParser.java b/avaje-sigma/src/main/java/io/avaje/sigma/routes/PathParser.java
@@ -8,7 +8,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<>();

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/PathSegment.java b/avaje-sigma/src/main/java/io/avaje/sigma/routes/PathSegment.java
@@ -4,7 +4,7 @@
 
 import java.util.List;
 
-abstract class PathSegment {
+abstract sealed class PathSegment {
 
   abstract String asRegexString(boolean extract);
 
@@ -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
     }
@@ -35,7 +35,7 @@ boolean multiSlash() {
     }
   }
 
-  private abstract static class Parameter extends PathSegment {
+  private abstract static sealed class Parameter extends PathSegment {
     private final String name;
     private final String regex;
 
@@ -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() {

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/PathSegmentParser.java b/avaje-sigma/src/main/java/io/avaje/sigma/routes/PathSegmentParser.java
@@ -7,7 +7,7 @@
 import java.util.regex.MatchResult;
 import java.util.regex.Pattern;
 
-class PathSegmentParser {
+final class PathSegmentParser {
 
   private static final PathSegment WILDCARD = new PathSegment.Wildcard();
 
@@ -31,7 +31,7 @@ class PathSegmentParser {
   }
 
   static PathSegment parse(String seg, String rawPath) {
-    if (seg.equals("*")) {
+    if ("*".equals(seg)) {
       return WILDCARD;
     }
     return new PathSegmentParser(seg, rawPath).parse();
@@ -42,10 +42,7 @@ PathSegment parse() {
     if (matchOnlyStartEnd('<', '>')) {
       return new PathSegment.SlashAcceptingParameter(trim(segment));
     }
-    if (matchOnlyStartEnd('{', '}')) {
-      return new PathSegment.SlashIgnoringParameter(trim(segment));
-    }
-    if (matchParamWithRegex(segment)) {
+    if (matchOnlyStartEnd('{', '}') || matchParamWithRegex(segment)) {
       return new PathSegment.SlashIgnoringParameter(trim(segment));
     }
     if (matchLiteral(segment)) {
@@ -79,7 +76,7 @@ private PathSegment parseMultiSegment() {
   }
 
   private PathSegment tokenSegment(String token) {
-    if (token.equals("*")) {
+    if ("*".equals(token)) {
       return WILDCARD;
     } else if (token.startsWith("<")) {
       return slashAccepting(token);

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/RegBuilder.java b/avaje-sigma/src/main/java/io/avaje/sigma/routes/RegBuilder.java
@@ -5,7 +5,7 @@
 import java.util.regex.Pattern;
 
 /** 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;

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/RouteEntry.java b/avaje-sigma/src/main/java/io/avaje/sigma/routes/RouteEntry.java
@@ -4,7 +4,7 @@
 import io.avaje.sigma.HttpContext;
 import java.util.Map;
 
-class RouteEntry implements SpiRoutes.Entry {
+final class RouteEntry implements SpiRoutes.Entry {
 
   private final PathParser path;
   private final Handler handler;

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/RouteIndex.java b/avaje-sigma/src/main/java/io/avaje/sigma/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. */
   private final RouteIndex.Entry[] entries = new RouteIndex.Entry[6];

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/Routes.java b/avaje-sigma/src/main/java/io/avaje/sigma/routes/Routes.java
@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
-class Routes implements SpiRoutes {
+final class Routes implements SpiRoutes {
 
   /** The "real" handlers by http method. */
   private final EnumMap<Router.HttpMethod, RouteIndex> typeMap;

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/RoutesBuilder.java b/avaje-sigma/src/main/java/io/avaje/sigma/routes/RoutesBuilder.java
@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class RoutesBuilder {
+public final class RoutesBuilder {
 
   private final EnumMap<Router.HttpMethod, RouteIndex> typeMap =
       new EnumMap<>(Router.HttpMethod.class);

diff --git a/avaje-sigma/src/main/java/io/avaje/sigma/routes/SpiRoutes.java b/avaje-sigma/src/main/java/io/avaje/sigma/routes/SpiRoutes.java
@@ -5,7 +5,7 @@
 import java.util.Map;
 
 /** Route matching and filter handling. */
-public interface SpiRoutes {
+public sealed interface SpiRoutes permits Routes {
 
   /** Find the matching handler entry given the type and request URI. */
   Entry match(Router.HttpMethod type, String pathInfo);
@@ -19,7 +19,7 @@ public interface SpiRoutes {
   void handleException(HttpContext ctx, Exception e);
 
   /** A route entry. */
-  interface Entry {
+  sealed interface Entry permits FilterEntry, RouteEntry {
 
     /** Return true if it matches the request URI. */
     boolean matches(String requestUri);