refactor: move handler into his own package

jknack · jknack · commit 2f06441f6db9 · 2023-06-18T20:44:56.000-03:00
diff --git a/docs/asciidoc/migration/3.x.adoc b/docs/asciidoc/migration/3.x.adoc
@@ -67,8 +67,21 @@ Kotlin was removed from core, you need to the `jooby-kotlin` dependency:
 |io.jooby.Route.Decorator|io.jooby.Route.Filter| jooby (core)
 |io.jooby.Kooby|io.jooby.kt.Kooby| jooby-kotlin (new module)
 |io.jooby.jetty.Jetty|io.jooby.jetty.JettyServer| jooby-jetty
-|io.jooby.netty.netty|io.jooby.netty.NettyServer| jooby-netty
+|io.jooby.netty.Netty|io.jooby.netty.NettyServer| jooby-netty
 |io.jooby.utow.Utow|io.jooby.undertow.UndertowServer| jooby-undertow
+|io.jooby.AccessLogHandler|io.jooby.handler.AccessLogHandler| jooby (core)
+|io.jooby.Cors|io.jooby.handler.Cors| jooby (core)
+|io.jooby.CorsHandler|io.jooby.handler.CorsHandler| jooby (core)
+|io.jooby.CsrfHandler|io.jooby.handler.CsrfHandler| jooby (core)
+|io.jooby.HeadHandler|io.jooby.handler.HeadHandler| jooby (core)
+|io.jooby.RateLimitHandler|io.jooby.handler.RateLimitHandler| jooby (core)
+|io.jooby.SSLHandler|io.jooby.handler.SSLHandler| jooby (core)
+|io.jooby.TraceHandler|io.jooby.handler.TraceHandler| jooby (core)
+|io.jooby.WebVariables|io.jooby.handler.WebVariables| jooby (core)
+|io.jooby.Asset|io.jooby.handler.Asset| jooby (core)
+|io.jooby.AssetHandler|io.jooby.handler.AssetHandler| jooby (core)
+|io.jooby.AssetSource|io.jooby.handler.AssetSource| jooby (core)
+|io.jooby.CacheControl|io.jooby.handler.CacheControl| jooby (core)
 |===
 
 ==== Method renames
diff --git a/jooby/src/main/java/io/jooby/OpenAPIModule.java b/jooby/src/main/java/io/jooby/OpenAPIModule.java
@@ -17,6 +17,8 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import io.jooby.SneakyThrows.Consumer2;
+import io.jooby.handler.Asset;
+import io.jooby.handler.AssetSource;
 import io.jooby.internal.IOUtils;
 
 /**
diff --git a/jooby/src/main/java/io/jooby/Router.java b/jooby/src/main/java/io/jooby/Router.java
@@ -35,6 +35,8 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import io.jooby.exception.MissingValueException;
+import io.jooby.handler.AssetHandler;
+import io.jooby.handler.AssetSource;
 import jakarta.inject.Provider;
 
 /**
@@ -83,18 +85,25 @@ default Object execute(@NonNull Context context) {
 
   /** HTTP GET. */
   String GET = "GET";
+
   /** HTTP POST. */
   String POST = "POST";
+
   /** HTTP PUT. */
   String PUT = "PUT";
+
   /** HTTP DELETE. */
   String DELETE = "DELETE";
+
   /** HTTP PATCH. */
   String PATCH = "PATCH";
+
   /** HTTP HEAD. */
   String HEAD = "HEAD";
+
   /** HTTP OPTIONS. */
   String OPTIONS = "OPTIONS";
+
   /** HTTP TRACE. */
   String TRACE = "TRACE";
 
diff --git a/jooby/src/main/java/io/jooby/handler/AccessLogHandler.java b/jooby/src/main/java/io/jooby/handler/AccessLogHandler.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import static java.util.Objects.requireNonNull;
 
@@ -21,6 +21,9 @@
 import org.slf4j.LoggerFactory;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Context;
+import io.jooby.Route;
+import io.jooby.Router;
 
 /**
  * Access Log Handler.
@@ -159,6 +162,7 @@ public class AccessLogHandler implements Route.Filter {
 
   private static final Function<Context, String> USER_OR_DASH =
       ctx -> Optional.ofNullable(ctx.getUser()).map(Object::toString).orElse(DASH);
+
   /** Default buffer size. */
   private static final int MESSAGE_SIZE = 256;
 
diff --git a/jooby/src/main/java/io/jooby/handler/Asset.java b/jooby/src/main/java/io/jooby/handler/Asset.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,6 +16,8 @@
 import java.util.Base64;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.MediaType;
+import io.jooby.SneakyThrows;
 import io.jooby.internal.FileAsset;
 import io.jooby.internal.JarAsset;
 import io.jooby.internal.URLAsset;
diff --git a/jooby/src/main/java/io/jooby/handler/AssetHandler.java b/jooby/src/main/java/io/jooby/handler/AssetHandler.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import static java.util.Objects.requireNonNull;
 
@@ -13,6 +13,9 @@
 import java.util.function.Function;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Context;
+import io.jooby.Route;
+import io.jooby.StatusCode;
 
 /**
  * Handler for static resources represented by the {@link Asset} contract.
diff --git a/jooby/src/main/java/io/jooby/handler/AssetSource.java b/jooby/src/main/java/io/jooby/handler/AssetSource.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -16,6 +16,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.SneakyThrows;
 import io.jooby.internal.ClassPathAssetSource;
 import io.jooby.internal.FileDiskAssetSource;
 import io.jooby.internal.FolderDiskAssetSource;
diff --git a/jooby/src/main/java/io/jooby/handler/CacheControl.java b/jooby/src/main/java/io/jooby/handler/CacheControl.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import java.time.Duration;
 import java.util.function.Function;
diff --git a/jooby/src/main/java/io/jooby/handler/Cors.java b/jooby/src/main/java/io/jooby/handler/Cors.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/jooby/src/main/java/io/jooby/handler/CorsHandler.java b/jooby/src/main/java/io/jooby/handler/CorsHandler.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -15,6 +15,10 @@
 import org.slf4j.LoggerFactory;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Context;
+import io.jooby.Route;
+import io.jooby.Router;
+import io.jooby.StatusCode;
 
 /**
  * Handle preflight and simple CORS requests. CORS options are set via: {@link Cors}.
diff --git a/jooby/src/main/java/io/jooby/handler/CsrfHandler.java b/jooby/src/main/java/io/jooby/handler/CsrfHandler.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import java.util.Objects;
 import java.util.UUID;
@@ -12,6 +12,10 @@
 import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Context;
+import io.jooby.Route;
+import io.jooby.Router;
+import io.jooby.Session;
 import io.jooby.exception.InvalidCsrfToken;
 
 /**
diff --git a/jooby/src/main/java/io/jooby/handler/HeadHandler.java b/jooby/src/main/java/io/jooby/handler/HeadHandler.java
@@ -3,9 +3,11 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Route;
+import io.jooby.Router;
 import io.jooby.internal.HeadContext;
 
 /**
diff --git a/jooby/src/main/java/io/jooby/handler/RateLimitHandler.java b/jooby/src/main/java/io/jooby/handler/RateLimitHandler.java
@@ -3,7 +3,7 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
@@ -14,6 +14,10 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.github.bucket4j.Bucket;
 import io.github.bucket4j.ConsumptionProbe;
+import io.jooby.Context;
+import io.jooby.Route;
+import io.jooby.SneakyThrows;
+import io.jooby.StatusCode;
 
 /**
  * Rate limit handler using https://github.com/vladimir-bukhtoyarov/bucket4j.
diff --git a/jooby/src/main/java/io/jooby/handler/SSLHandler.java b/jooby/src/main/java/io/jooby/handler/SSLHandler.java
@@ -3,9 +3,12 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Context;
+import io.jooby.Route;
+import io.jooby.Router;
 
 /**
  * Force SSL handler. Check for non-HTTPs request and force client to use HTTPs by redirecting the
diff --git a/jooby/src/main/java/io/jooby/handler/TraceHandler.java b/jooby/src/main/java/io/jooby/handler/TraceHandler.java
@@ -3,13 +3,15 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Route;
+import io.jooby.Router;
 
 /**
  * The TRACE method performs a message loop-back test along the path to the target resource.
diff --git a/jooby/src/main/java/io/jooby/handler/WebVariables.java b/jooby/src/main/java/io/jooby/handler/WebVariables.java
@@ -3,9 +3,11 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-package io.jooby;
+package io.jooby.handler;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import io.jooby.Context;
+import io.jooby.Route;
 
 /**
  * Add common variables to as {@link Context} attributes so they are accessible from template
diff --git a/jooby/src/main/java/io/jooby/internal/ClassPathAssetSource.java b/jooby/src/main/java/io/jooby/internal/ClassPathAssetSource.java
@@ -16,8 +16,8 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.Asset;
-import io.jooby.AssetSource;
+import io.jooby.handler.Asset;
+import io.jooby.handler.AssetSource;
 
 public class ClassPathAssetSource implements AssetSource {
 
diff --git a/jooby/src/main/java/io/jooby/internal/FileAsset.java b/jooby/src/main/java/io/jooby/internal/FileAsset.java
@@ -12,9 +12,9 @@
 import java.nio.file.Path;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.Asset;
 import io.jooby.MediaType;
 import io.jooby.SneakyThrows;
+import io.jooby.handler.Asset;
 
 /**
  * File system asset.
diff --git a/jooby/src/main/java/io/jooby/internal/FileDiskAssetSource.java b/jooby/src/main/java/io/jooby/internal/FileDiskAssetSource.java
@@ -9,8 +9,8 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.Asset;
-import io.jooby.AssetSource;
+import io.jooby.handler.Asset;
+import io.jooby.handler.AssetSource;
 
 public class FileDiskAssetSource implements AssetSource {
   private Path filepath;
diff --git a/jooby/src/main/java/io/jooby/internal/FolderDiskAssetSource.java b/jooby/src/main/java/io/jooby/internal/FolderDiskAssetSource.java
@@ -10,8 +10,8 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
-import io.jooby.Asset;
-import io.jooby.AssetSource;
+import io.jooby.handler.Asset;
+import io.jooby.handler.AssetSource;
 
 public class FolderDiskAssetSource implements AssetSource {
   private Path location;
diff --git a/jooby/src/main/java/io/jooby/internal/JarAsset.java b/jooby/src/main/java/io/jooby/internal/JarAsset.java
@@ -12,9 +12,9 @@
 import java.util.zip.ZipEntry;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.Asset;
 import io.jooby.MediaType;
 import io.jooby.SneakyThrows;
+import io.jooby.handler.Asset;
 
 public class JarAsset implements Asset {
 
diff --git a/jooby/src/main/java/io/jooby/internal/URLAsset.java b/jooby/src/main/java/io/jooby/internal/URLAsset.java
@@ -11,9 +11,9 @@
 import java.net.URLConnection;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.Asset;
 import io.jooby.MediaType;
 import io.jooby.SneakyThrows;
+import io.jooby.handler.Asset;
 
 /**
  * URL asset. Mostly represent a classpath file resource.
diff --git a/jooby/src/main/java/module-info.java b/jooby/src/main/java/module-info.java
@@ -3,13 +3,12 @@
  * Apache License Version 2.0 https://jooby.io/LICENSE.txt
  * Copyright 2014 Edgar Espina
  */
-/**
- * Jooby module.
- */
+/** Jooby module. */
 module io.jooby {
   exports io.jooby;
   exports io.jooby.annotation;
   exports io.jooby.exception;
+  exports io.jooby.handler;
 
   uses io.jooby.MvcFactory;
   uses io.jooby.Server;
diff --git a/jooby/src/test/java/io/jooby/CorsTest.java b/jooby/src/test/java/io/jooby/CorsTest.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.Lists;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import io.jooby.handler.Cors;
 
 public class CorsTest {
 
diff --git a/jooby/src/test/java/io/jooby/internal/ClassPathAssetSourceTest.java b/jooby/src/test/java/io/jooby/internal/ClassPathAssetSourceTest.java
@@ -17,10 +17,10 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.jooby.Asset;
-import io.jooby.AssetSource;
 import io.jooby.MediaType;
 import io.jooby.SneakyThrows;
+import io.jooby.handler.Asset;
+import io.jooby.handler.AssetSource;
 
 public class ClassPathAssetSourceTest {
 
diff --git a/modules/jooby-kotlin/src/main/kotlin/io/jooby/kt/Kooby.kt b/modules/jooby-kotlin/src/main/kotlin/io/jooby/kt/Kooby.kt
diff --git a/tests/src/test/java/io/jooby/Issue2649.java b/tests/src/test/java/io/jooby/Issue2649.java
diff --git a/tests/src/test/java/io/jooby/i2367/Issue2367.java b/tests/src/test/java/io/jooby/i2367/Issue2367.java
diff --git a/tests/src/test/java/io/jooby/i2863/Issue2863.java b/tests/src/test/java/io/jooby/i2863/Issue2863.java
diff --git a/tests/src/test/java/io/jooby/test/FeaturedTest.java b/tests/src/test/java/io/jooby/test/FeaturedTest.java
diff --git a/tests/src/test/java/io/jooby/test/HttpsTest.java b/tests/src/test/java/io/jooby/test/HttpsTest.java
diff --git a/tests/src/test/java/io/jooby/test/Issue1413.java b/tests/src/test/java/io/jooby/test/Issue1413.java
diff --git a/tests/src/test/java/io/jooby/test/Issue1815.java b/tests/src/test/java/io/jooby/test/Issue1815.java
diff --git a/tests/src/test/java/io/jooby/test/Issue2372.java b/tests/src/test/java/io/jooby/test/Issue2372.java
diff --git a/tests/src/test/kotlin/i2710/Issue2710.kt b/tests/src/test/kotlin/i2710/Issue2710.kt
