WIP: jooby-hbv module

docs/asciidoc/static-files.adoc

@@ -134,23 +134,19 @@ control these headers programmatically:
 [source, java, role="primary"]
 ----
 {
-  AssetSource www = AssetSource.create(Paths.get("www"));
-  assets("/static/*", new AssetHandler(www)
+  assets("/static/*", Paths.get("www"))
     .setLastModified(false)
-    .setEtag(false)
-  );
+    .setEtag(false);
 }
 ----
 
 .Kotlin
 [source, kotlin, role="secondary"]
 ----
 {
-  val www = AssetSource.create(Paths.get("www"))
-  assets("/static/*", AssetHandler(www)
+  assets("/static/*", Paths.get("www"))
     .setLastModified(false)
     .setEtag(false)
-  );
 }
 ----
 
@@ -160,21 +156,17 @@ The `maxAge` option set a `Cache-Control` header:
 [source, java, role="primary"]
 ----
 {
-  AssetSource www = AssetSource.create(Paths.get("www"));
-  assets("/static/*", new AssetHandler(www)
+  assets("/static/*", Paths.get("www"))
     .setMaxAge(Duration.ofDays(365))
-  );
 }
 ----
 
 .Kotlin
 [source, kotlin, role="secondary"]
 ----
 {
-  val www = AssetSource.create(Paths.get("www"))
-  assets("/static/*", AssetHandler(www)
+  assets("/static/*", Paths.get("www"))
     .setMaxAge(Duration.ofDays(365))
-  );
 }
 ----
 
@@ -188,8 +180,7 @@ specify a function via javadoc:AssetHandler[cacheControl, java.util.Function]:
 [source, java, role="primary"]
 ----
 {
-  AssetSource www = AssetSource.create(Paths.get("www"));
-  assets("/static/*", new AssetHandler(www)
+  assets("/static/*", Paths.get("www"))
       .cacheControl(path -> {
         if (path.endsWith("dont-cache-me.html")) {
           return CacheControl.noCache(); // disable caching
@@ -200,16 +191,15 @@ specify a function via javadoc:AssetHandler[cacheControl, java.util.Function]:
         } else {
           return CacheControl.defaults(); // AssetHandler defaults
         }
-      }));
+      });
 }
 ----
 
 .Kotlin
 [source, kotlin, role="secondary"]
 ----
 {
-  val www = AssetSource.create(Paths.get("www"))
-  assets("/static/*", AssetHandler(www)
+  assets("/static/*", Paths.get("www"))
       .cacheControl {
         when {
           it.endsWith("dont-cache-me.html") -> CacheControl.noCache() // disable caching
@@ -218,6 +208,39 @@ specify a function via javadoc:AssetHandler[cacheControl, java.util.Function]:
               .setMaxAge(Duration.ofDays(365))
           else -> CacheControl.defaults() // AssetHandler defaults
         }
-      })
+      }
+}
+----
+
+The asset handler generates a `404` response code when requested path is not found. You can change this by throwing
+an exception or generating any other content you want:
+
+
+.Custom not found:
+[source, java, role="primary"]
+----
+{
+  assets("/static/*", Paths.get("www"))
+      .notFound(ctx -> {
+        throw new MyAssetException();
+      });
+
+  error(MyAssetException.class, (ctx, cause, code) -> {
+    // render MyAssetException as you want
+  });
 }
 ----
+
+.Kotlin
+[source, kotlin, role="secondary"]
+----
+{
+  assets("/static/*", Paths.get("www"))
+    .notFound { _ ->
+        throw MyAssetException()
+    }
+  error(MyAssetException::class) {
+    // render MyAssetException as you want
+  }
+}
+----

jooby/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.2.10-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -49,6 +49,12 @@
       <artifactId>jakarta.inject-api</artifactId>
     </dependency>
 
+    <!-- jakarta.validation -->
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+    </dependency>
+
     <!-- config -->
     <dependency>
       <groupId>com.typesafe</groupId>

jooby/src/main/java/io/jooby/DefaultContext.java

@@ -20,13 +20,12 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.time.Instant;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
 import org.slf4j.Logger;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -417,7 +416,20 @@ default boolean isSecure() {
         T result = ValueConverters.convert(body(), type, getRouter());
         return result;
       }
-      return (T) decoder(contentType).decode(this, type);
+      T object = (T) decoder(contentType).decode(this, type);
+
+      MessageValidator messageValidator = getRouter().getMessageValidator();
+      if (messageValidator != null) {
+        if (messageValidator.predicate().test(type)) {
+          Validator validator = messageValidator.validator();
+          Set<ConstraintViolation<T>> violations = validator.validate(object);
+          if (!violations.isEmpty()) {
+            throw new ConstraintViolationException(violations);
+          }
+        }
+      }
+      return object;
+
     } catch (Exception x) {
       throw SneakyThrows.propagate(x);
     }

jooby/src/main/java/io/jooby/Jooby.java

@@ -12,6 +12,7 @@
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -41,6 +42,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import jakarta.validation.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -627,6 +629,19 @@ public Jooby decoder(@NonNull MediaType contentType, @NonNull MessageDecoder dec
     return this;
   }
 
+  @NonNull
+  @Override
+  public Router messageValidator(@NonNull Validator validator, @NonNull Predicate<Type> predicate) {
+    router.messageValidator(validator, predicate);
+    return this;
+  }
+
+  @Nullable
+  @Override
+  public MessageValidator getMessageValidator() {
+    return router.getMessageValidator();
+  }
+
   @NonNull @Override
   public Jooby encoder(@NonNull MediaType contentType, @NonNull MessageEncoder encoder) {
     router.encoder(contentType, encoder);

jooby/src/main/java/io/jooby/MessageValidator.java

@@ -0,0 +1,9 @@
+package io.jooby;
+
+import jakarta.validation.Validator;
+
+import java.lang.reflect.Type;
+import java.util.function.Predicate;
+
+public record MessageValidator(Validator validator, Predicate<Type> predicate) {
+}

jooby/src/main/java/io/jooby/Router.java

@@ -8,6 +8,7 @@
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
 
+import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -28,6 +29,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import jakarta.validation.Validator;
 import org.slf4j.Logger;
 
 import com.typesafe.config.Config;
@@ -508,6 +510,8 @@ default Object execute(@NonNull Context context) {
    */
   @NonNull Router decoder(@NonNull MediaType contentType, @NonNull MessageDecoder decoder);
 
+  @NonNull Router messageValidator(@NonNull Validator validator, @NonNull Predicate<Type> predicate);
+  @Nullable MessageValidator getMessageValidator();
   /**
    * Returns the worker thread pool. This thread pool is used to run application blocking code.
    *
@@ -708,7 +712,7 @@ default Object execute(@NonNull Context context) {
    * @param source File system directory.
    * @return A route.
    */
-  default @NonNull Route assets(@NonNull String pattern, @NonNull Path source) {
+  default @NonNull AssetHandler assets(@NonNull String pattern, @NonNull Path source) {
     return assets(pattern, AssetSource.create(source));
   }
 
@@ -722,9 +726,9 @@ default Object execute(@NonNull Context context) {
    *
    * @param pattern Path pattern.
    * @param source File-System folder when exists, or fallback to a classpath folder.
-   * @return A route.
+   * @return AssetHandler.
    */
-  default @NonNull Route assets(@NonNull String pattern, @NonNull String source) {
+  default @NonNull AssetHandler assets(@NonNull String pattern, @NonNull String source) {
     Path path =
         Stream.of(source.split("/"))
             .reduce(Paths.get(System.getProperty("user.dir")), Path::resolve, Path::resolve);
@@ -742,7 +746,7 @@ default Object execute(@NonNull Context context) {
    * @param sources additional Asset sources.
    * @return A route.
    */
-  default @NonNull Route assets(
+  default @NonNull AssetHandler assets(
       @NonNull String pattern, @NonNull AssetSource source, @NonNull AssetSource... sources) {
     AssetSource[] allSources;
     if (sources.length == 0) {
@@ -762,8 +766,9 @@ default Object execute(@NonNull Context context) {
    * @param handler Asset handler.
    * @return A route.
    */
-  default @NonNull Route assets(@NonNull String pattern, @NonNull AssetHandler handler) {
-    return route(GET, pattern, handler);
+  default @NonNull AssetHandler assets(@NonNull String pattern, @NonNull AssetHandler handler) {
+    route(GET, pattern, handler);
+    return handler;
   }
 
   /**

jooby/src/main/java/io/jooby/handler/AssetHandler.java

@@ -14,10 +14,8 @@
 import java.util.function.Function;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.Context;
-import io.jooby.MediaType;
-import io.jooby.Route;
-import io.jooby.StatusCode;
+import edu.umd.cs.findbugs.annotations.Nullable;
+import io.jooby.*;
 
 /**
  * Handler for static resources represented by the {@link Asset} contract.
@@ -28,6 +26,8 @@
  * @since 2.0.0
  */
 public class AssetHandler implements Route.Handler {
+  private static final SneakyThrows.Consumer<Context> NOT_FOUND =
+      ctx -> ctx.send(StatusCode.NOT_FOUND);
   private static final int ONE_SEC = 1000;
 
   private final AssetSource[] sources;
@@ -41,6 +41,7 @@ public class AssetHandler implements Route.Handler {
   private Function<String, CacheControl> cacheControl = path -> defaults;
 
   private Function<Asset, MediaType> mediaTypeResolver = Asset::getContentType;
+  private SneakyThrows.Consumer<Context> notFound = NOT_FOUND;
 
   /**
    * Creates a new asset handler that fallback to the given fallback asset when the asset is not
@@ -82,7 +83,7 @@ public Object apply(@NonNull Context ctx) throws Exception {
       }
       // Still null?
       if (asset == null) {
-        ctx.send(StatusCode.NOT_FOUND);
+        notFound.accept(ctx);
         return ctx;
       } else {
         resolvedPath = fallback;
@@ -230,7 +231,19 @@ public AssetHandler cacheControl(@NonNull Function<String, CacheControl> cacheCo
     return this;
   }
 
-  private Asset resolve(String filepath) {
+  /**
+   * Sets a custom handler for <code>404</code> asset/resource. By default, generates a <code>404
+   * </code> status code response.
+   *
+   * @param handler Handler.
+   * @return This handler.
+   */
+  public AssetHandler notFound(@NonNull SneakyThrows.Consumer<Context> handler) {
+    this.notFound = handler;
+    return this;
+  }
+
+  private @Nullable Asset resolve(String filepath) {
     for (AssetSource source : sources) {
       Asset asset = source.resolve(filepath);
       if (asset != null) {
@@ -243,7 +256,7 @@ private Asset resolve(String filepath) {
   @Override
   public void setRoute(Route route) {
     List<String> keys = route.getPathKeys();
-    this.filekey = keys.size() == 0 ? route.getPattern().substring(1) : keys.get(0);
+    this.filekey = keys.isEmpty() ? route.getPattern().substring(1) : keys.get(0);
     // NOTE: It send an inputstream we don't need a renderer
     route.setReturnType(Context.class);
   }