Available via {@link dev.relism.extension.FlashContext}: + *
Available via {@link FlashContext}: *
{@code
* Guard guard = ctx.require(Guard.class);
* }
@@ -23,7 +25,7 @@ import java.util.concurrent.TimeUnit;
* }
*
* The resolver name is looked up once here (at wiring time, not on each request). - * If the name is not registered, {@link dev.relism.exceptions.InitializationException} + * If the name is not registered, {@link InitializationException} * is thrown immediately. */ public final class Guard { diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/KeyResolver.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/KeyResolver.java similarity index 88% rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/KeyResolver.java rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/KeyResolver.java index ef4bb06..7fd678a 100644 --- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/KeyResolver.java +++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/KeyResolver.java @@ -1,6 +1,6 @@ -package dev.relism.ext.limiter; +package dev.relism.flash.ext.limiter; -import dev.relism.models.Request; +import dev.relism.flash.models.Request; /** * Extracts a partition key from an incoming request. diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/Limit.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/Limit.java similarity index 84% rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/Limit.java rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/Limit.java index ea4b484..2437dac 100644 --- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/Limit.java +++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/Limit.java @@ -1,4 +1,7 @@ -package dev.relism.ext.limiter; +package dev.relism.flash.ext.limiter; + +import dev.relism.flash.exceptions.InitializationException; +import dev.relism.flash.models.RequestHandler; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,11 +10,11 @@ import java.lang.annotation.Target; import java.util.concurrent.TimeUnit; /** - * Applies a rate limit to a class-based {@link dev.relism.models.RequestHandler}. + * Applies a rate limit to a class-based {@link RequestHandler}. * *
The annotation is processed at boot time by the {@link LimiterExtension} annotation * processor. If {@link #key()} names a resolver that was never registered, - * startup fails immediately with {@link dev.relism.exceptions.InitializationException}. + * startup fails immediately with {@link InitializationException}. * *
{@code
* // 100 req/s per client IP — fixed window
diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimitConfig.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimitConfig.java
similarity index 92%
rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimitConfig.java
rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimitConfig.java
index 2e63f19..b3393f9 100644
--- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimitConfig.java
+++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimitConfig.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.limiter;
+package dev.relism.flash.ext.limiter;
/**
* Immutable configuration snapshot for a single rate-limit rule.
diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimitStrategy.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimitStrategy.java
similarity index 89%
rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimitStrategy.java
rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimitStrategy.java
index c36792f..73852b0 100644
--- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimitStrategy.java
+++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimitStrategy.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.limiter;
+package dev.relism.flash.ext.limiter;
-import dev.relism.ext.limiter.strategy.FixedWindowStrategy;
-import dev.relism.ext.limiter.strategy.SlidingWindowStrategy;
-import dev.relism.ext.limiter.strategy.TokenBucketStrategy;
+import dev.relism.flash.ext.limiter.strategy.FixedWindowStrategy;
+import dev.relism.flash.ext.limiter.strategy.SlidingWindowStrategy;
+import dev.relism.flash.ext.limiter.strategy.TokenBucketStrategy;
/**
* Enumeration of built-in rate-limit algorithms. Each constant is a factory
diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimiterConfig.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimiterConfig.java
similarity index 97%
rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimiterConfig.java
rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimiterConfig.java
index c2cb1c5..607db07 100644
--- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimiterConfig.java
+++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimiterConfig.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.limiter;
+package dev.relism.flash.ext.limiter;
-import dev.relism.exceptions.InitializationException;
+import dev.relism.flash.exceptions.InitializationException;
import java.net.InetSocketAddress;
import java.util.LinkedHashMap;
diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimiterExtension.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimiterExtension.java
similarity index 89%
rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimiterExtension.java
rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimiterExtension.java
index 896e43b..7e2bed6 100644
--- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/LimiterExtension.java
+++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/LimiterExtension.java
@@ -1,14 +1,16 @@
-package dev.relism.ext.limiter;
+package dev.relism.flash.ext.limiter;
-import dev.relism.ext.openapi.OpenApiContributorRegistry;
-import dev.relism.ext.openapi.OpenApiOperationContribution;
-import dev.relism.ext.openapi.OpenApiResponseContribution;
-import dev.relism.extension.ExtensionPhase;
-import dev.relism.extension.FlashContext;
-import dev.relism.extension.FlashExtension;
-import dev.relism.extension.FlashRegistrar;
-import dev.relism.http.HttpStatus;
-import dev.relism.routing.Middleware;
+import dev.relism.flash.ext.openapi.OpenApiContributor;
+import dev.relism.flash.ext.openapi.OpenApiContributorRegistry;
+import dev.relism.flash.ext.openapi.OpenApiOperationContribution;
+import dev.relism.flash.ext.openapi.OpenApiResponseContribution;
+import dev.relism.flash.extension.AnnotationProcessor;
+import dev.relism.flash.extension.ExtensionPhase;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.extension.FlashExtension;
+import dev.relism.flash.extension.FlashRegistrar;
+import dev.relism.flash.http.HttpStatus;
+import dev.relism.flash.routing.Middleware;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -21,7 +23,7 @@ import java.util.Map;
*
* - Creates a single {@link BucketStore} shared by all rules in this extension instance.
* - Provides a {@link Guard} in the {@link FlashContext} for manual use on lambda routes.
- * - Registers an {@link dev.relism.extension.AnnotationProcessor} for {@link Limit}:
+ *
- Registers an {@link AnnotationProcessor} for {@link Limit}:
* reads the annotation once per handler class at boot, resolves the key lambda
* fail-fast, then returns a pre-compiled middleware — zero map lookups at request time.
*
@@ -162,9 +164,9 @@ public final class LimiterExtension implements FlashExtension {
static void register(FlashContext ctx) {
ctx.find(OpenApiContributorRegistry.class)
- .ifPresent(registry -> registry.add(new dev.relism.ext.openapi.OpenApiContributor() {
+ .ifPresent(registry -> registry.add(new OpenApiContributor() {
@Override
- public dev.relism.ext.openapi.OpenApiOperationContribution operationFor(Class handlerClass) {
+ public OpenApiOperationContribution operationFor(Class handlerClass) {
if (handlerClass.getAnnotation(Limit.class) == null) {
return OpenApiOperationContribution.builder().build();
}
diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/RateLimitStrategy.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/RateLimitStrategy.java
similarity index 80%
rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/RateLimitStrategy.java
rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/RateLimitStrategy.java
index b5584d6..5a35a71 100644
--- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/RateLimitStrategy.java
+++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/RateLimitStrategy.java
@@ -1,4 +1,8 @@
-package dev.relism.ext.limiter;
+package dev.relism.flash.ext.limiter;
+
+import dev.relism.flash.ext.limiter.strategy.FixedWindowStrategy;
+import dev.relism.flash.ext.limiter.strategy.SlidingWindowStrategy;
+import dev.relism.flash.ext.limiter.strategy.TokenBucketStrategy;
/**
* Contract for a rate-limit algorithm. Implementations must be:
@@ -10,9 +14,9 @@ package dev.relism.ext.limiter;
*
* Called on every request — must not allocate on the hot path.
*
- * @see dev.relism.ext.limiter.strategy.FixedWindowStrategy
- * @see dev.relism.ext.limiter.strategy.SlidingWindowStrategy
- * @see dev.relism.ext.limiter.strategy.TokenBucketStrategy
+ * @see FixedWindowStrategy
+ * @see SlidingWindowStrategy
+ * @see TokenBucketStrategy
*/
public interface RateLimitStrategy {
diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/strategy/FixedWindowStrategy.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/strategy/FixedWindowStrategy.java
similarity index 91%
rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/strategy/FixedWindowStrategy.java
rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/strategy/FixedWindowStrategy.java
index 179aa85..736e49c 100644
--- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/strategy/FixedWindowStrategy.java
+++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/strategy/FixedWindowStrategy.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.limiter.strategy;
+package dev.relism.flash.ext.limiter.strategy;
-import dev.relism.ext.limiter.Bucket;
-import dev.relism.ext.limiter.LimitConfig;
-import dev.relism.ext.limiter.RateLimitStrategy;
+import dev.relism.flash.ext.limiter.Bucket;
+import dev.relism.flash.ext.limiter.LimitConfig;
+import dev.relism.flash.ext.limiter.RateLimitStrategy;
/**
* Fixed-window rate limit: allows up to {@link LimitConfig#limit()} requests per window of
diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/strategy/SlidingWindowStrategy.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/strategy/SlidingWindowStrategy.java
similarity index 95%
rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/strategy/SlidingWindowStrategy.java
rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/strategy/SlidingWindowStrategy.java
index 0e2dedd..fd8aabe 100644
--- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/strategy/SlidingWindowStrategy.java
+++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/strategy/SlidingWindowStrategy.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.limiter.strategy;
+package dev.relism.flash.ext.limiter.strategy;
-import dev.relism.ext.limiter.Bucket;
-import dev.relism.ext.limiter.LimitConfig;
-import dev.relism.ext.limiter.RateLimitStrategy;
+import dev.relism.flash.ext.limiter.Bucket;
+import dev.relism.flash.ext.limiter.LimitConfig;
+import dev.relism.flash.ext.limiter.RateLimitStrategy;
/**
* Sliding-window counter rate limit: approximates a true sliding window by interpolating
diff --git a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/strategy/TokenBucketStrategy.java b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/strategy/TokenBucketStrategy.java
similarity index 94%
rename from flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/strategy/TokenBucketStrategy.java
rename to flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/strategy/TokenBucketStrategy.java
index cb49430..39444ae 100644
--- a/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/ext/limiter/strategy/TokenBucketStrategy.java
+++ b/flash-extensions/flash-ext-limiter/src/main/java/dev/relism/flash/ext/limiter/strategy/TokenBucketStrategy.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.limiter.strategy;
+package dev.relism.flash.ext.limiter.strategy;
-import dev.relism.ext.limiter.Bucket;
-import dev.relism.ext.limiter.LimitConfig;
-import dev.relism.ext.limiter.RateLimitStrategy;
+import dev.relism.flash.ext.limiter.Bucket;
+import dev.relism.flash.ext.limiter.LimitConfig;
+import dev.relism.flash.ext.limiter.RateLimitStrategy;
/**
* Token-bucket rate limit: tokens refill continuously at a rate of
diff --git a/flash-extensions/flash-ext-limiter/src/test/java/dev/relism/ext/limiter/LimiterOpenApiInteropTest.java b/flash-extensions/flash-ext-limiter/src/test/java/dev/relism/flash/ext/limiter/LimiterOpenApiInteropTest.java
similarity index 84%
rename from flash-extensions/flash-ext-limiter/src/test/java/dev/relism/ext/limiter/LimiterOpenApiInteropTest.java
rename to flash-extensions/flash-ext-limiter/src/test/java/dev/relism/flash/ext/limiter/LimiterOpenApiInteropTest.java
index 37b5aa4..168b4fc 100644
--- a/flash-extensions/flash-ext-limiter/src/test/java/dev/relism/ext/limiter/LimiterOpenApiInteropTest.java
+++ b/flash-extensions/flash-ext-limiter/src/test/java/dev/relism/flash/ext/limiter/LimiterOpenApiInteropTest.java
@@ -1,14 +1,14 @@
-package dev.relism.ext.limiter;
+package dev.relism.flash.ext.limiter;
-import dev.relism.ext.openapi.OpenApiContributor;
-import dev.relism.ext.openapi.OpenApiContributorRegistry;
-import dev.relism.ext.openapi.OpenApiOperationContribution;
-import dev.relism.ext.openapi.OpenApiResponseContribution;
-import dev.relism.extension.FlashContext;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.Response;
-import dev.relism.routing.GET;
+import dev.relism.flash.ext.openapi.OpenApiContributor;
+import dev.relism.flash.ext.openapi.OpenApiContributorRegistry;
+import dev.relism.flash.ext.openapi.OpenApiOperationContribution;
+import dev.relism.flash.ext.openapi.OpenApiResponseContribution;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.routing.GET;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/Authenticated.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/Authenticated.java
similarity index 97%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/Authenticated.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/Authenticated.java
index 7a3158d..4888202 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/Authenticated.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/Authenticated.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/ClaimsHolder.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/ClaimsHolder.java
similarity index 98%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/ClaimsHolder.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/ClaimsHolder.java
index d5debdb..490147a 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/ClaimsHolder.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/ClaimsHolder.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.util.Map;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/ClientAuthMethod.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/ClientAuthMethod.java
similarity index 94%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/ClientAuthMethod.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/ClientAuthMethod.java
index 9e4510a..337039f 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/ClientAuthMethod.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/ClientAuthMethod.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
/**
* OAuth2 client authentication method for the token endpoint (RFC 6749 §2.3).
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/DiscoveryClient.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/DiscoveryClient.java
similarity index 98%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/DiscoveryClient.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/DiscoveryClient.java
index 8349f7f..40b6b0c 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/DiscoveryClient.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/DiscoveryClient.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import net.minidev.json.JSONValue;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/InMemoryOidcSessionStore.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/InMemoryOidcSessionStore.java
similarity index 95%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/InMemoryOidcSessionStore.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/InMemoryOidcSessionStore.java
index f5af0bb..3df2afc 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/InMemoryOidcSessionStore.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/InMemoryOidcSessionStore.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/JwtUtils.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/JwtUtils.java
similarity index 97%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/JwtUtils.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/JwtUtils.java
index 627ed47..c456733 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/JwtUtils.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/JwtUtils.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import net.minidev.json.JSONValue;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/JwtValidator.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/JwtValidator.java
similarity index 98%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/JwtValidator.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/JwtValidator.java
index b0c1ce1..a0bde6f 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/JwtValidator.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/JwtValidator.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jose.jwk.source.JWKSource;
@@ -12,7 +12,7 @@ import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.proc.ConfigurableJWTProcessor;
import com.nimbusds.jwt.proc.DefaultJWTClaimsVerifier;
import com.nimbusds.jwt.proc.DefaultJWTProcessor;
-import dev.relism.exceptions.HttpException;
+import dev.relism.flash.exceptions.HttpException;
import java.io.IOException;
import java.net.URL;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcAuthPolicy.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcAuthPolicy.java
similarity index 99%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcAuthPolicy.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcAuthPolicy.java
index 23ccce7..4f7c5b1 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcAuthPolicy.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcAuthPolicy.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.util.LinkedHashSet;
import java.util.List;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcConfig.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcConfig.java
similarity index 99%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcConfig.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcConfig.java
index 4820097..837af03 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcConfig.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcConfig.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
/**
* Full OIDC client configuration. Build via
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcExtension.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcExtension.java
similarity index 95%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcExtension.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcExtension.java
index 3093c14..f7f59a8 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcExtension.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcExtension.java
@@ -1,12 +1,13 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
-import dev.relism.ext.openapi.OpenApiContributor;
-import dev.relism.ext.openapi.OpenApiContributorRegistry;
-import dev.relism.ext.openapi.OpenApiOperationContribution;
-import dev.relism.ext.openapi.OpenApiResponseContribution;
-import dev.relism.extension.FlashContext;
-import dev.relism.extension.FlashExtension;
-import dev.relism.extension.FlashRegistrar;
+import dev.relism.flash.ext.openapi.OpenApiContributor;
+import dev.relism.flash.ext.openapi.OpenApiContributorRegistry;
+import dev.relism.flash.ext.openapi.OpenApiOperationContribution;
+import dev.relism.flash.ext.openapi.OpenApiResponseContribution;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.extension.FlashExtension;
+import dev.relism.flash.extension.FlashRegistrar;
+import dev.relism.flash.models.Request;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
@@ -245,11 +246,11 @@ public class OidcExtension implements FlashExtension {
}
}
- private String absoluteRedirectUri(dev.relism.models.Request req) {
+ private String absoluteRedirectUri(Request req) {
return absoluteSelf(req, config.redirectUri());
}
- private String absoluteSelf(dev.relism.models.Request req, String uri) {
+ private String absoluteSelf(Request req, String uri) {
if (!uri.startsWith("/")) return uri;
return config.selfScheme() + "://" + req.header("Host") + uri;
}
@@ -264,7 +265,7 @@ public class OidcExtension implements FlashExtension {
/**
* Loaded lazily so that {@code flash-ext-openapi} classes are only resolved at
- * runtime when {@link dev.relism.ext.openapi.OpenApiContributorRegistry} is actually on the classpath.
+ * runtime when {@link OpenApiContributorRegistry} is actually on the classpath.
*/
private static final class OpenApiIntegration {
static void register(FlashContext ctx,
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcMiddleware.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcMiddleware.java
similarity index 97%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcMiddleware.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcMiddleware.java
index a64c260..78ef6c8 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcMiddleware.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcMiddleware.java
@@ -1,8 +1,10 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
-import dev.relism.exceptions.HttpException;
-import dev.relism.models.Request;
-import dev.relism.routing.Middleware;
+import dev.relism.flash.exceptions.HttpException;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.routing.Middleware;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
@@ -14,7 +16,7 @@ import java.util.Map;
import java.util.Optional;
/**
- * Request-level OIDC middleware. Exposed in the {@link dev.relism.extension.FlashContext}
+ * Request-level OIDC middleware. Exposed in the {@link FlashContext}
* for manual use on lambda routes; injected automatically for handlers annotated with
* {@link Authenticated}, {@link RolesAllowed} or {@link ScopesAllowed}.
*
@@ -192,7 +194,7 @@ public class OidcMiddleware {
* Returns claims on success, or {@code null} if a redirect was already written to
* {@code res}. Throws {@link HttpException} 401/403 for API clients.
*/
- private Map resolve(Request req, dev.relism.models.Response res) {
+ private Map resolve(Request req, Response res) {
// 1. Bearer token
String bearerToken = extractBearerToken(req.header("Authorization"));
if (bearerToken != null) {
@@ -258,7 +260,7 @@ public class OidcMiddleware {
);
}
- private void enforcePolicy(Map claims, OidcAuthPolicy policy, dev.relism.models.Response res) {
+ private void enforcePolicy(Map claims, OidcAuthPolicy policy, Response res) {
checkRoles(claims, policy.requiredRoles());
checkScopes(claims, policy.requiredScopes(), policy.scopeMatch(), res);
}
@@ -270,7 +272,7 @@ public class OidcMiddleware {
}
private void checkScopes(Map claims, String[] required, ScopesAllowed.Match match,
- dev.relism.models.Response res) {
+ Response res) {
if (required.length == 0) return;
if (scopesAllowed(claims, required, match)) return;
res.header("WWW-Authenticate", insufficientScopeChallenge(required));
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcProviderMetadata.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcProviderMetadata.java
similarity index 92%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcProviderMetadata.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcProviderMetadata.java
index a646f42..cc783af 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcProviderMetadata.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcProviderMetadata.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
/**
* OIDC provider endpoints discovered from {@code {issuer}/.well-known/openid-configuration}.
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcSession.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcSession.java
similarity index 98%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcSession.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcSession.java
index fefdb17..742404b 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcSession.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcSession.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.time.Instant;
import java.util.Map;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcSessionStore.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcSessionStore.java
similarity index 92%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcSessionStore.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcSessionStore.java
index f7966c2..b23f816 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcSessionStore.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcSessionStore.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.util.Optional;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcStateStore.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcStateStore.java
similarity index 97%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcStateStore.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcStateStore.java
index d8954f4..4918cbd 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcStateStore.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcStateStore.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.time.Instant;
import java.util.Optional;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcTokenResponse.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcTokenResponse.java
similarity index 90%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcTokenResponse.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcTokenResponse.java
index 9ab5c54..8afad32 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcTokenResponse.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcTokenResponse.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
/** Parsed response from an OAuth2 token endpoint. Package-private — internal use only. */
record OidcTokenResponse(
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcUser.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcUser.java
similarity index 99%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcUser.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcUser.java
index e8382b1..d54f7f4 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcUser.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcUser.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.util.List;
import java.util.Map;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcValidationException.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcValidationException.java
similarity index 69%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcValidationException.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcValidationException.java
index 459285c..202f75f 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/OidcValidationException.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/OidcValidationException.java
@@ -1,8 +1,10 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
+
+import dev.relism.flash.exceptions.HttpException;
/**
* Thrown when OIDC token validation fails (signature, claims, nonce, expiry, etc.).
- * Distinct from {@link dev.relism.exceptions.HttpException}: this signals a protocol-level
+ * Distinct from {@link HttpException}: this signals a protocol-level
* failure, not an HTTP response — callers decide the appropriate status code.
*/
public final class OidcValidationException extends RuntimeException {
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/PkceUtils.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/PkceUtils.java
similarity index 97%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/PkceUtils.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/PkceUtils.java
index 70a0fed..99fc632 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/PkceUtils.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/PkceUtils.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/RolesAllowed.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/RolesAllowed.java
similarity index 96%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/RolesAllowed.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/RolesAllowed.java
index 3f6a05b..1009f14 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/RolesAllowed.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/RolesAllowed.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/ScopesAllowed.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/ScopesAllowed.java
similarity index 97%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/ScopesAllowed.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/ScopesAllowed.java
index 5213e6d..a5ba66f 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/ScopesAllowed.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/ScopesAllowed.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/TokenClient.java b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/TokenClient.java
similarity index 99%
rename from flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/TokenClient.java
rename to flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/TokenClient.java
index 88f949c..a6be2c2 100644
--- a/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/ext/oidc/TokenClient.java
+++ b/flash-extensions/flash-ext-oidc/src/main/java/dev/relism/flash/ext/oidc/TokenClient.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import net.minidev.json.JSONValue;
diff --git a/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcAuthPolicyTest.java b/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcAuthPolicyTest.java
similarity index 98%
rename from flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcAuthPolicyTest.java
rename to flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcAuthPolicyTest.java
index 0223937..e1677a5 100644
--- a/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcAuthPolicyTest.java
+++ b/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcAuthPolicyTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import org.junit.jupiter.api.Test;
diff --git a/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcMiddlewareAuthzTest.java b/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcMiddlewareAuthzTest.java
similarity index 98%
rename from flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcMiddlewareAuthzTest.java
rename to flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcMiddlewareAuthzTest.java
index 588777c..b38a1ae 100644
--- a/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcMiddlewareAuthzTest.java
+++ b/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcMiddlewareAuthzTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import org.junit.jupiter.api.Test;
diff --git a/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcOpenApiInteropTest.java b/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcOpenApiInteropTest.java
similarity index 78%
rename from flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcOpenApiInteropTest.java
rename to flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcOpenApiInteropTest.java
index e199d04..d84bcf3 100644
--- a/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcOpenApiInteropTest.java
+++ b/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcOpenApiInteropTest.java
@@ -1,6 +1,10 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
-import dev.relism.ext.openapi.OpenApiContributor;
+import dev.relism.flash.ext.openapi.OpenApiContributorRegistry;
+import dev.relism.flash.ext.openapi.OpenApiOperationContribution;
+import dev.relism.flash.ext.openapi.OpenApiResponseContribution;
+import dev.relism.flash.ext.openapi.OpenApiContributor;
+import dev.relism.flash.extension.FlashContext;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Constructor;
@@ -82,24 +86,24 @@ class OidcOpenApiInteropTest {
@Test
void securityContribution_presentForAuthenticatedHandler() throws Exception {
- dev.relism.ext.openapi.OpenApiOperationContribution operation = contributor().operationFor(AuthOnly.class);
+ OpenApiOperationContribution operation = contributor().operationFor(AuthOnly.class);
List>> security = operation.security();
assertEquals(1, security.size());
assertTrue(security.getFirst().containsKey("issuer"));
}
private static OpenApiContributor contributor() throws Exception {
- Class clazz = Class.forName("dev.relism.ext.oidc.OidcExtension$OpenApiIntegration");
+ Class clazz = Class.forName("dev.relism.flash.ext.oidc.OidcExtension$OpenApiIntegration");
Constructor ctor = clazz.getDeclaredConstructor();
ctor.setAccessible(true);
Object instance = ctor.newInstance();
- Method m = clazz.getDeclaredMethod("register", dev.relism.extension.FlashContext.class, OidcConfig.class, OidcProviderMetadata.class);
+ Method m = clazz.getDeclaredMethod("register", FlashContext.class, OidcConfig.class, OidcProviderMetadata.class);
m.setAccessible(true);
- dev.relism.extension.FlashContext ctx = new dev.relism.extension.FlashContext();
- dev.relism.ext.openapi.OpenApiContributorRegistry registry = new dev.relism.ext.openapi.OpenApiContributorRegistry();
- ctx.provide(dev.relism.ext.openapi.OpenApiContributorRegistry.class, registry);
+ FlashContext ctx = new FlashContext();
+ OpenApiContributorRegistry registry = new OpenApiContributorRegistry();
+ ctx.provide(OpenApiContributorRegistry.class, registry);
OidcConfig config = OidcConfig.builder("https://issuer", "c", "s", "/cb").build();
OidcProviderMetadata meta = new OidcProviderMetadata("a", "t", "u", "j", "e");
@@ -109,9 +113,9 @@ class OidcOpenApiInteropTest {
}
private static Map responses(Class cls) throws Exception {
- Map byCode = contributor().operationFor(cls).responses();
+ Map byCode = contributor().operationFor(cls).responses();
java.util.LinkedHashMap out = new java.util.LinkedHashMap<>();
- for (Map.Entry e : byCode.entrySet()) {
+ for (Map.Entry e : byCode.entrySet()) {
out.put(e.getKey(), e.getValue().description());
}
return out;
diff --git a/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcUserScopesTest.java b/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcUserScopesTest.java
similarity index 97%
rename from flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcUserScopesTest.java
rename to flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcUserScopesTest.java
index 5657000..4fbcc67 100644
--- a/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/ext/oidc/OidcUserScopesTest.java
+++ b/flash-extensions/flash-ext-oidc/src/test/java/dev/relism/flash/ext/oidc/OidcUserScopesTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.oidc;
+package dev.relism.flash.ext.oidc;
import org.junit.jupiter.api.Test;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/APIResponse.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/APIResponse.java
similarity index 93%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/APIResponse.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/APIResponse.java
index 0ab1cc7..133d4bb 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/APIResponse.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/APIResponse.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Repeatable;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/APIResponses.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/APIResponses.java
similarity index 90%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/APIResponses.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/APIResponses.java
index 3920120..dd1493e 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/APIResponses.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/APIResponses.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/ApiOperation.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/ApiOperation.java
similarity index 95%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/ApiOperation.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/ApiOperation.java
index 3817cb0..9d3c859 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/ApiOperation.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/ApiOperation.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/ArraySchema.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/ArraySchema.java
similarity index 92%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/ArraySchema.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/ArraySchema.java
index 93253a8..a5588bc 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/ArraySchema.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/ArraySchema.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Content.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Content.java
similarity index 85%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Content.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Content.java
index de4ee23..b93bc9b 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Content.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Content.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
-import dev.relism.http.ContentType;
+import dev.relism.flash.http.ContentType;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiBuilder.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiBuilder.java
similarity index 98%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiBuilder.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiBuilder.java
index 5149d13..07a52b1 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiBuilder.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiBuilder.java
@@ -1,14 +1,15 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty.Access;
-import dev.relism.http.ContentType;
-import dev.relism.http.HttpStatus;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
-import dev.relism.routing.Route;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.http.HttpStatus;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.routing.Route;
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
@@ -26,10 +27,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -566,9 +565,9 @@ public final class OpenApiBuilder {
if (meta == null) continue;
String path = readPathValue(ann);
if (path == null) continue;
- dev.relism.http.HttpMethod method = meta.method();
+ HttpMethod method = meta.method();
return new Route() {
- @Override public dev.relism.http.HttpMethod method() { return method; }
+ @Override public HttpMethod method() { return method; }
@Override public String path() { return path; }
@Override public Class annotationType() { return Route.class; }
};
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiContributor.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiContributor.java
similarity index 88%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiContributor.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiContributor.java
index 19c9d2a..bb41c9e 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiContributor.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiContributor.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.util.Map;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiContributorRegistry.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiContributorRegistry.java
similarity index 92%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiContributorRegistry.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiContributorRegistry.java
index f3b5e30..7bbd1dd 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiContributorRegistry.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiContributorRegistry.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.util.Collections;
import java.util.List;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiExtension.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiExtension.java
similarity index 93%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiExtension.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiExtension.java
index b7c52a2..f13469d 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiExtension.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiExtension.java
@@ -1,14 +1,15 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
-import dev.relism.extension.FlashContext;
-import dev.relism.extension.FlashExtension;
-import dev.relism.extension.FlashRegistrar;
-import dev.relism.extension.RouteEvent;
-import dev.relism.http.ContentType;
-import dev.relism.routing.Route;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.extension.FlashExtension;
+import dev.relism.flash.extension.FlashRegistrar;
+import dev.relism.flash.extension.RouteEvent;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.routing.Route;
/**
* Generates and serves an OpenAPI 3.0 spec and Swagger UI under a configurable base path.
@@ -132,7 +133,7 @@ public class OpenApiExtension implements FlashExtension {
private static Route routeOf(RouteEvent event) {
return new Route() {
- @Override public dev.relism.http.HttpMethod method() { return event.method(); }
+ @Override public HttpMethod method() { return event.method(); }
@Override public String path() { return event.path(); }
@Override public Class annotationType() { return Route.class; }
};
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiOperationContribution.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiOperationContribution.java
similarity index 98%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiOperationContribution.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiOperationContribution.java
index a0d9793..ff4f30f 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiOperationContribution.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiOperationContribution.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.util.ArrayList;
import java.util.LinkedHashMap;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiResponseContribution.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiResponseContribution.java
similarity index 97%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiResponseContribution.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiResponseContribution.java
index e1a73d7..abdb92e 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/OpenApiResponseContribution.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/OpenApiResponseContribution.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Parameter.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Parameter.java
similarity index 95%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Parameter.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Parameter.java
index 94acada..b474d64 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Parameter.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Parameter.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Repeatable;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/ParameterIn.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/ParameterIn.java
similarity index 83%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/ParameterIn.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/ParameterIn.java
index eeeea91..d3ef125 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/ParameterIn.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/ParameterIn.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.util.Locale;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Parameters.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Parameters.java
similarity index 90%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Parameters.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Parameters.java
index c0bcc22..805197d 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Parameters.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Parameters.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Schema.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Schema.java
similarity index 95%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Schema.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Schema.java
index 7e9549a..4e61b67 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/Schema.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/Schema.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/SchemaProperty.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/SchemaProperty.java
similarity index 94%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/SchemaProperty.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/SchemaProperty.java
index 84fb267..06cccc1 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/SchemaProperty.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/SchemaProperty.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/SchemaType.java b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/SchemaType.java
similarity index 84%
rename from flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/SchemaType.java
rename to flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/SchemaType.java
index 884beb9..f55de4c 100644
--- a/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/ext/openapi/SchemaType.java
+++ b/flash-extensions/flash-ext-openapi/src/main/java/dev/relism/flash/ext/openapi/SchemaType.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import java.util.Locale;
diff --git a/flash-extensions/flash-ext-openapi/src/test/java/dev/relism/ext/openapi/OpenApiBuilderTest.java b/flash-extensions/flash-ext-openapi/src/test/java/dev/relism/flash/ext/openapi/OpenApiBuilderTest.java
similarity index 90%
rename from flash-extensions/flash-ext-openapi/src/test/java/dev/relism/ext/openapi/OpenApiBuilderTest.java
rename to flash-extensions/flash-ext-openapi/src/test/java/dev/relism/flash/ext/openapi/OpenApiBuilderTest.java
index b10fae0..4362b46 100644
--- a/flash-extensions/flash-ext-openapi/src/test/java/dev/relism/ext/openapi/OpenApiBuilderTest.java
+++ b/flash-extensions/flash-ext-openapi/src/test/java/dev/relism/flash/ext/openapi/OpenApiBuilderTest.java
@@ -1,10 +1,13 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
-import dev.relism.http.ContentType;
-import dev.relism.routing.GET;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.routing.GET;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -21,9 +24,9 @@ class OpenApiBuilderTest {
@ApiOperation(summary = "Get user")
@Parameter(name = "expand", in = ParameterIn.QUERY, required = false, type = SchemaType.STRING, examples = {"roles", "permissions"})
@APIResponse(responseCode = "200", description = "User found", content = @Content(contentType = ContentType.JSON, schema = UserDto.class))
- static class GetUserHandler extends dev.relism.models.RequestHandler {
+ static class GetUserHandler extends RequestHandler {
@Override
- public Object handle(dev.relism.models.Request request, dev.relism.models.Response response) {
+ public Object handle(Request request, Response response) {
return null;
}
}
@@ -31,9 +34,9 @@ class OpenApiBuilderTest {
@GET("/users")
@ApiOperation(summary = "List users")
@APIResponse(responseCode = "200", content = @Content(contentType = ContentType.JSON, schema = UserDto.class, array = true))
- static class ListUsersHandler extends dev.relism.models.RequestHandler {
+ static class ListUsersHandler extends RequestHandler {
@Override
- public Object handle(dev.relism.models.Request request, dev.relism.models.Response response) {
+ public Object handle(Request request, Response response) {
return null;
}
}
@@ -41,9 +44,9 @@ class OpenApiBuilderTest {
@GET("/ping")
@ApiOperation(summary = "Ping")
@APIResponse(responseCode = "204", description = "No content", content = @Content(contentType = ContentType.NONE))
- static class PingHandler extends dev.relism.models.RequestHandler {
+ static class PingHandler extends RequestHandler {
@Override
- public Object handle(dev.relism.models.Request request, dev.relism.models.Response response) {
+ public Object handle(Request request, Response response) {
return null;
}
}
@@ -51,9 +54,9 @@ class OpenApiBuilderTest {
@GET("/secure")
@ApiOperation(summary = "Secure")
@APIResponse(responseCode = "403", description = "Custom forbidden")
- static class SecureHandler extends dev.relism.models.RequestHandler {
+ static class SecureHandler extends RequestHandler {
@Override
- public Object handle(dev.relism.models.Request request, dev.relism.models.Response response) {
+ public Object handle(Request request, Response response) {
return null;
}
}
@@ -61,9 +64,9 @@ class OpenApiBuilderTest {
@GET("/typed")
@ApiOperation(summary = "Typed")
@APIResponse(responseCode = "200", content = @Content)
- static class TypedHandler extends dev.relism.models.RequestHandler {
+ static class TypedHandler extends RequestHandler {
@Override
- public UserDto handle(dev.relism.models.Request request, dev.relism.models.Response response) {
+ public UserDto handle(Request request, Response response) {
return new UserDto();
}
}
@@ -71,9 +74,9 @@ class OpenApiBuilderTest {
@GET("/typed-list")
@ApiOperation(summary = "Typed list")
@APIResponse(responseCode = "200", content = @Content)
- static class TypedListHandler extends dev.relism.models.RequestHandler {
+ static class TypedListHandler extends RequestHandler {
@Override
- public List handle(dev.relism.models.Request request, dev.relism.models.Response response) {
+ public List handle(Request request, Response response) {
return List.of();
}
}
@@ -81,9 +84,9 @@ class OpenApiBuilderTest {
@GET("/typed-map")
@ApiOperation(summary = "Typed map")
@APIResponse(responseCode = "200", content = @Content)
- static class TypedMapHandler extends dev.relism.models.RequestHandler {
+ static class TypedMapHandler extends RequestHandler {
@Override
- public Map handle(dev.relism.models.Request request, dev.relism.models.Response response) {
+ public Map handle(Request request, Response response) {
return Map.of();
}
}
@@ -91,9 +94,9 @@ class OpenApiBuilderTest {
@GET("/merge")
@ApiOperation(summary = "Merge")
@APIResponse(responseCode = "200", description = "Manual 200")
- static class MergeHandler extends dev.relism.models.RequestHandler {
+ static class MergeHandler extends RequestHandler {
@Override
- public Object handle(dev.relism.models.Request request, dev.relism.models.Response response) {
+ public Object handle(Request request, Response response) {
return null;
}
}
diff --git a/flash-extensions/flash-ext-openapi/src/test/java/dev/relism/ext/openapi/OpenApiExtensionTest.java b/flash-extensions/flash-ext-openapi/src/test/java/dev/relism/flash/ext/openapi/OpenApiExtensionTest.java
similarity index 90%
rename from flash-extensions/flash-ext-openapi/src/test/java/dev/relism/ext/openapi/OpenApiExtensionTest.java
rename to flash-extensions/flash-ext-openapi/src/test/java/dev/relism/flash/ext/openapi/OpenApiExtensionTest.java
index 67ab89e..590d89e 100644
--- a/flash-extensions/flash-ext-openapi/src/test/java/dev/relism/ext/openapi/OpenApiExtensionTest.java
+++ b/flash-extensions/flash-ext-openapi/src/test/java/dev/relism/flash/ext/openapi/OpenApiExtensionTest.java
@@ -1,16 +1,17 @@
-package dev.relism.ext.openapi;
+package dev.relism.flash.ext.openapi;
import com.fasterxml.jackson.databind.ObjectMapper;
-import dev.relism.extension.FlashContext;
-import dev.relism.extension.FlashRegistrar;
-import dev.relism.extension.RouteEvent;
-import dev.relism.extension.RouteListener;
-import dev.relism.http.ContentType;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.Response;
-import dev.relism.routing.GET;
-import dev.relism.routing.Middleware;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.extension.FlashRegistrar;
+import dev.relism.flash.extension.RouteEvent;
+import dev.relism.flash.extension.RouteListener;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.routing.GET;
+import dev.relism.flash.routing.Middleware;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
@@ -30,7 +31,7 @@ class OpenApiExtensionTest {
@APIResponse(responseCode = "200", description = "OK")
static class HealthHandler extends RequestHandler {
@Override
- public Object handle(dev.relism.models.Request request, Response response) {
+ public Object handle(Request request, Response response) {
return "ok";
}
}
@@ -88,7 +89,7 @@ class OpenApiExtensionTest {
@ApiOperation(summary = "Scoped users")
static class ScopedUsersHandler extends RequestHandler {
@Override
- public Object handle(dev.relism.models.Request request, Response response) {
+ public Object handle(Request request, Response response) {
return List.of();
}
}
diff --git a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/GraphSerializer.java b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/GraphSerializer.java
similarity index 96%
rename from flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/GraphSerializer.java
rename to flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/GraphSerializer.java
index f44c17a..199d284 100644
--- a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/GraphSerializer.java
+++ b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/GraphSerializer.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.routeviewer;
+package dev.relism.flash.ext.routeviewer;
-import dev.relism.ext.routeviewer.model.RouteGraph;
-import dev.relism.ext.routeviewer.model.RouterNode;
-import dev.relism.ext.routeviewer.model.RouteRecord;
+import dev.relism.flash.ext.routeviewer.model.RouteGraph;
+import dev.relism.flash.ext.routeviewer.model.RouterNode;
+import dev.relism.flash.ext.routeviewer.model.RouteRecord;
import java.util.ArrayList;
import java.util.List;
diff --git a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerDataHandler.java b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerDataHandler.java
similarity index 76%
rename from flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerDataHandler.java
rename to flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerDataHandler.java
index 0d995e2..6b9b278 100644
--- a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerDataHandler.java
+++ b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerDataHandler.java
@@ -1,9 +1,9 @@
-package dev.relism.ext.routeviewer;
+package dev.relism.flash.ext.routeviewer;
-import dev.relism.ext.routeviewer.model.RouteGraph;
-import dev.relism.http.ContentType;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
+import dev.relism.flash.ext.routeviewer.model.RouteGraph;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
/**
* Serves {@code GET /routeviewer/data} — the JSON payload consumed by the React SPA.
diff --git a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerExtension.java b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerExtension.java
similarity index 87%
rename from flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerExtension.java
rename to flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerExtension.java
index 4b22acf..9630519 100644
--- a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerExtension.java
+++ b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerExtension.java
@@ -1,11 +1,11 @@
-package dev.relism.ext.routeviewer;
+package dev.relism.flash.ext.routeviewer;
-import dev.relism.ext.routeviewer.model.RouteGraph;
-import dev.relism.extension.ExtensionPhase;
-import dev.relism.extension.FlashContext;
-import dev.relism.extension.FlashExtension;
-import dev.relism.extension.FlashRegistrar;
-import dev.relism.http.ContentType;
+import dev.relism.flash.ext.routeviewer.model.RouteGraph;
+import dev.relism.flash.extension.ExtensionPhase;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.extension.FlashExtension;
+import dev.relism.flash.extension.FlashRegistrar;
+import dev.relism.flash.http.ContentType;
/**
* Mounts an interactive route-graph viewer at a configurable HTTP endpoint.
diff --git a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerHandler.java b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerHandler.java
similarity index 87%
rename from flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerHandler.java
rename to flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerHandler.java
index 8df2138..1fefceb 100644
--- a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerHandler.java
+++ b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerHandler.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.routeviewer;
+package dev.relism.flash.ext.routeviewer;
-import dev.relism.http.ContentType;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
import java.io.IOException;
import java.io.InputStream;
diff --git a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerStaticHandler.java b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerStaticHandler.java
similarity index 88%
rename from flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerStaticHandler.java
rename to flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerStaticHandler.java
index 1135015..2fa566a 100644
--- a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/RouteViewerStaticHandler.java
+++ b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/RouteViewerStaticHandler.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.routeviewer;
+package dev.relism.flash.ext.routeviewer;
-import dev.relism.http.ContentType;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
import java.io.IOException;
import java.io.InputStream;
diff --git a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/model/RouteGraph.java b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/model/RouteGraph.java
similarity index 88%
rename from flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/model/RouteGraph.java
rename to flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/model/RouteGraph.java
index 0ba2967..4f520df 100644
--- a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/model/RouteGraph.java
+++ b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/model/RouteGraph.java
@@ -1,6 +1,7 @@
-package dev.relism.ext.routeviewer.model;
+package dev.relism.flash.ext.routeviewer.model;
-import dev.relism.extension.RouteEvent;
+import dev.relism.flash.extension.RouteListener;
+import dev.relism.flash.extension.RouteEvent;
import java.util.*;
@@ -18,7 +19,7 @@ public class RouteGraph {
/** Namespace → routerType, filled on first event for each namespace. */
private final Map routerTypes = new LinkedHashMap<>();
- /** Called once per route by the {@link dev.relism.extension.RouteListener}. */
+ /** Called once per route by the {@link RouteListener}. */
public void add(RouteEvent event) {
routerTypes.putIfAbsent(event.namespace(), event.routerType());
byNamespace
diff --git a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/model/RouteRecord.java b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/model/RouteRecord.java
similarity index 97%
rename from flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/model/RouteRecord.java
rename to flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/model/RouteRecord.java
index f0cdaf0..8e6e357 100644
--- a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/model/RouteRecord.java
+++ b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/model/RouteRecord.java
@@ -1,7 +1,7 @@
-package dev.relism.ext.routeviewer.model;
+package dev.relism.flash.ext.routeviewer.model;
-import dev.relism.extension.RouteEvent;
-import dev.relism.routing.Middleware;
+import dev.relism.flash.extension.RouteEvent;
+import dev.relism.flash.routing.Middleware;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
diff --git a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/model/RouterNode.java b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/model/RouterNode.java
similarity index 95%
rename from flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/model/RouterNode.java
rename to flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/model/RouterNode.java
index eabef4c..09e8b75 100644
--- a/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/ext/routeviewer/model/RouterNode.java
+++ b/flash-extensions/flash-ext-routeviewer/src/main/java/dev/relism/flash/ext/routeviewer/model/RouterNode.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.routeviewer.model;
+package dev.relism.flash.ext.routeviewer.model;
import java.util.List;
diff --git a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/BaseViewExtension.java b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/BaseViewExtension.java
similarity index 86%
rename from flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/BaseViewExtension.java
rename to flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/BaseViewExtension.java
index 4df2096..e475de1 100644
--- a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/BaseViewExtension.java
+++ b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/BaseViewExtension.java
@@ -1,9 +1,9 @@
-package dev.relism.ext.view.core;
+package dev.relism.flash.ext.view.core;
-import dev.relism.extension.FlashContext;
-import dev.relism.extension.FlashExtension;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.extension.FlashExtension;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
import java.util.ArrayList;
import java.util.List;
diff --git a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/BaseViewHandler.java b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/BaseViewHandler.java
similarity index 93%
rename from flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/BaseViewHandler.java
rename to flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/BaseViewHandler.java
index 4a4a650..19326d7 100644
--- a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/BaseViewHandler.java
+++ b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/BaseViewHandler.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.view.core;
+package dev.relism.flash.ext.view.core;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.Response;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
public abstract class BaseViewHandler extends RequestHandler {
private static final byte DISPATCH_RENDER_2 = 1;
diff --git a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/GlobalValue.java b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/GlobalValue.java
similarity index 59%
rename from flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/GlobalValue.java
rename to flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/GlobalValue.java
index 757727d..6da814f 100644
--- a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/GlobalValue.java
+++ b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/GlobalValue.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.view.core;
+package dev.relism.flash.ext.view.core;
-import dev.relism.models.Request;
+import dev.relism.flash.models.Request;
import java.util.function.Function;
diff --git a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/RenderedView.java b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/RenderedView.java
similarity index 82%
rename from flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/RenderedView.java
rename to flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/RenderedView.java
index 1c6a9ea..026917a 100644
--- a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/RenderedView.java
+++ b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/RenderedView.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.view.core;
+package dev.relism.flash.ext.view.core;
-import dev.relism.http.ContentType;
+import dev.relism.flash.http.ContentType;
/**
* Render result returned by engine runtimes.
diff --git a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/ViewModel.java b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/ViewModel.java
similarity index 98%
rename from flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/ViewModel.java
rename to flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/ViewModel.java
index e1db8e1..1c45922 100644
--- a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/ViewModel.java
+++ b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/ViewModel.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.view.core;
+package dev.relism.flash.ext.view.core;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/ViewRuntimeBridge.java b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/ViewRuntimeBridge.java
similarity index 63%
rename from flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/ViewRuntimeBridge.java
rename to flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/ViewRuntimeBridge.java
index 42ec4ea..280c160 100644
--- a/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/ext/view/core/ViewRuntimeBridge.java
+++ b/flash-extensions/flash-ext-view-core/src/main/java/dev/relism/flash/ext/view/core/ViewRuntimeBridge.java
@@ -1,7 +1,7 @@
-package dev.relism.ext.view.core;
+package dev.relism.flash.ext.view.core;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
public interface ViewRuntimeBridge {
TTarget resolve(Class handlerClass);
diff --git a/flash-extensions/flash-ext-view-core/src/test/java/dev/relism/ext/view/core/ViewModelTest.java b/flash-extensions/flash-ext-view-core/src/test/java/dev/relism/flash/ext/view/core/ViewModelTest.java
similarity index 98%
rename from flash-extensions/flash-ext-view-core/src/test/java/dev/relism/ext/view/core/ViewModelTest.java
rename to flash-extensions/flash-ext-view-core/src/test/java/dev/relism/flash/ext/view/core/ViewModelTest.java
index 1c01470..454c1c3 100644
--- a/flash-extensions/flash-ext-view-core/src/test/java/dev/relism/ext/view/core/ViewModelTest.java
+++ b/flash-extensions/flash-ext-view-core/src/test/java/dev/relism/flash/ext/view/core/ViewModelTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.view.core;
+package dev.relism.flash.ext.view.core;
import org.junit.jupiter.api.Test;
diff --git a/flash-extensions/flash-ext-view-jte/README.md b/flash-extensions/flash-ext-view-jte/README.md
index 910ec10..2ee83fe 100644
--- a/flash-extensions/flash-ext-view-jte/README.md
+++ b/flash-extensions/flash-ext-view-jte/README.md
@@ -18,34 +18,45 @@ The extension mirrors `gg.jte.ContentType` into Flash HTTP content type:
## Quick Start
```java
-import dev.relism.extension.FlashApp;
-import dev.relism.ext.view.core.ViewModel;
-import dev.relism.ext.view.jte.*;
+import jte.view.ext.dev.relism.flash.JteExtension;
FlashApp.create(8080)
- .install(new JteExtension(cfg -> cfg
- .templateRoot("/templates")
- .contentType(gg.jte.ContentType.Html)))
- .scan("com.example.web")
- .startAndBlock();
+ .
+
+install(new JteExtension(cfg ->cfg
+ .
+
+templateRoot("/templates")
+ .
+
+contentType(gg.jte.ContentType.Html)))
+ .
+
+scan("com.example.web")
+ .
+
+startAndBlock();
```
```java
-import dev.relism.ext.view.core.ViewModel;
-import dev.relism.ext.view.jte.*;
-import dev.relism.routing.GET;
+import core.view.ext.dev.relism.flash.ViewModel;
+import jte.view.ext.dev.relism.flash.JteHandler;
+import jte.view.ext.dev.relism.flash.Template;
+import models.dev.relism.flash.Request;
+import routing.dev.relism.flash.GET;
@GET("/")
@Template("pages/home.jte")
public final class HomePage extends JteHandler {
@Override
- public ViewModel render(dev.relism.models.Request req) {
+ public ViewModel render(Request req) {
return ViewModel.empty()
- .with("page", new HomePageModel("Flash + jte", "elorc"))
- .with("build", "dev");
+ .with("page", new HomePageModel("Flash + jte", "elorc"))
+ .with("build", "dev");
}
- public record HomePageModel(String title, String author) {}
+ public record HomePageModel(String title, String author) {
+ }
}
```
diff --git a/flash-extensions/flash-ext-view-jte/docs/handlers.md b/flash-extensions/flash-ext-view-jte/docs/handlers.md
index 5d40202..8fe8749 100644
--- a/flash-extensions/flash-ext-view-jte/docs/handlers.md
+++ b/flash-extensions/flash-ext-view-jte/docs/handlers.md
@@ -12,6 +12,8 @@ Use `onViewInit()` to cache dependencies via `require(...)`.
## Example
```java
+import models.dev.relism.flash.Request;
+
@GET("/dashboard")
@Template("pages/dashboard.jte")
public final class DashboardPage extends JteHandler {
@@ -24,9 +26,9 @@ public final class DashboardPage extends JteHandler {
}
@Override
- public ViewModel render(dev.relism.models.Request req) {
+ public ViewModel render(Request req) {
return ViewModel.empty()
- .with("page", service.page(req));
+ .with("page", service.page(req));
}
}
```
diff --git a/flash-extensions/flash-ext-view-jte/jte-classes/gg/jte/generated/ondemand/pages/JtehomeGenerated.class b/flash-extensions/flash-ext-view-jte/jte-classes/gg/jte/generated/ondemand/pages/JtehomeGenerated.class
index 7ef7715..22995af 100644
Binary files a/flash-extensions/flash-ext-view-jte/jte-classes/gg/jte/generated/ondemand/pages/JtehomeGenerated.class and b/flash-extensions/flash-ext-view-jte/jte-classes/gg/jte/generated/ondemand/pages/JtehomeGenerated.class differ
diff --git a/flash-extensions/flash-ext-view-jte/jte-classes/gg/jte/generated/ondemand/pages/JtehomeGenerated.java b/flash-extensions/flash-ext-view-jte/jte-classes/gg/jte/generated/ondemand/pages/JtehomeGenerated.java
index fc74c2b..9fb39b4 100644
--- a/flash-extensions/flash-ext-view-jte/jte-classes/gg/jte/generated/ondemand/pages/JtehomeGenerated.java
+++ b/flash-extensions/flash-ext-view-jte/jte-classes/gg/jte/generated/ondemand/pages/JtehomeGenerated.java
@@ -1,5 +1,5 @@
package gg.jte.generated.ondemand.pages;
-import dev.relism.ext.view.jte.model.HomePage;
+import dev.relism.flash.ext.view.jte.model.HomePage;
import java.util.Map;
@SuppressWarnings("unchecked")
public final class JtehomeGenerated {
diff --git a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteTarget.java b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteTarget.java
deleted file mode 100644
index 41c2a98..0000000
--- a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteTarget.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package dev.relism.ext.view.jte;
-
-import dev.relism.http.ContentType;
-
-record JteTarget(String template, ContentType contentType) {}
diff --git a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteExtension.java b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteExtension.java
similarity index 87%
rename from flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteExtension.java
rename to flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteExtension.java
index d60b6e9..6ff638c 100644
--- a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteExtension.java
+++ b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteExtension.java
@@ -1,10 +1,10 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
-import dev.relism.ext.view.core.BaseViewExtension;
-import dev.relism.ext.view.core.GlobalValue;
-import dev.relism.ext.view.core.ViewRuntimeBridge;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
+import dev.relism.flash.ext.view.core.BaseViewExtension;
+import dev.relism.flash.ext.view.core.GlobalValue;
+import dev.relism.flash.ext.view.core.ViewRuntimeBridge;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
import java.util.List;
import java.util.function.Consumer;
diff --git a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteHandler.java b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteHandler.java
similarity index 57%
rename from flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteHandler.java
rename to flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteHandler.java
index 30d290b..d262180 100644
--- a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteHandler.java
+++ b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteHandler.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
-import dev.relism.ext.view.core.BaseViewHandler;
+import dev.relism.flash.ext.view.core.BaseViewHandler;
/**
* Base class for class-based jte handlers.
diff --git a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteRuntime.java b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteRuntime.java
similarity index 91%
rename from flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteRuntime.java
rename to flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteRuntime.java
index df3cde4..edccec7 100644
--- a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteRuntime.java
+++ b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteRuntime.java
@@ -1,12 +1,12 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
-import dev.relism.ext.view.core.BaseViewHandler;
-import dev.relism.ext.view.core.GlobalValue;
-import dev.relism.ext.view.core.RenderedView;
-import dev.relism.ext.view.core.ViewModel;
-import dev.relism.ext.view.core.ViewRuntimeBridge;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
+import dev.relism.flash.ext.view.core.BaseViewHandler;
+import dev.relism.flash.ext.view.core.GlobalValue;
+import dev.relism.flash.ext.view.core.RenderedView;
+import dev.relism.flash.ext.view.core.ViewModel;
+import dev.relism.flash.ext.view.core.ViewRuntimeBridge;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
import gg.jte.CodeResolver;
import gg.jte.TemplateEngine;
import gg.jte.output.StringOutput;
diff --git a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteSettings.java b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteSettings.java
similarity index 98%
rename from flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteSettings.java
rename to flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteSettings.java
index f0b8365..38ddc27 100644
--- a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteSettings.java
+++ b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteSettings.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
-import dev.relism.Flash;
+import dev.relism.flash.Flash;
import java.nio.file.Path;
diff --git a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteTarget.java b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteTarget.java
new file mode 100644
index 0000000..c1bcb8d
--- /dev/null
+++ b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteTarget.java
@@ -0,0 +1,5 @@
+package dev.relism.flash.ext.view.jte;
+
+import dev.relism.flash.http.ContentType;
+
+record JteTarget(String template, ContentType contentType) {}
diff --git a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteTargetResolver.java b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteTargetResolver.java
similarity index 90%
rename from flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteTargetResolver.java
rename to flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteTargetResolver.java
index 7cf33e4..2f5cbc1 100644
--- a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/JteTargetResolver.java
+++ b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/JteTargetResolver.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
-import dev.relism.http.ContentType;
-import dev.relism.routing.Route;
-import dev.relism.routing.Routes;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.routing.Route;
+import dev.relism.flash.routing.Routes;
final class JteTargetResolver {
private JteTargetResolver() {}
diff --git a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/Template.java b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/Template.java
similarity index 89%
rename from flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/Template.java
rename to flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/Template.java
index 54bbbd4..3278b68 100644
--- a/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/ext/view/jte/Template.java
+++ b/flash-extensions/flash-ext-view-jte/src/main/java/dev/relism/flash/ext/view/jte/Template.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteExtensionTest.java b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteExtensionTest.java
similarity index 86%
rename from flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteExtensionTest.java
rename to flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteExtensionTest.java
index e36f5aa..d5a328d 100644
--- a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteExtensionTest.java
+++ b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteExtensionTest.java
@@ -1,9 +1,10 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.Response;
-import dev.relism.routing.GET;
+import dev.relism.flash.ext.view.core.ViewModel;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.routing.GET;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
@@ -16,8 +17,8 @@ class JteExtensionTest {
@Template("pages/home.jte")
static class ValidHandler extends JteHandler {
@Override
- public dev.relism.ext.view.core.ViewModel render(Request req) {
- return dev.relism.ext.view.core.ViewModel.empty();
+ public ViewModel render(Request req) {
+ return ViewModel.empty();
}
}
diff --git a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteRuntimeTest.java b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteRuntimeTest.java
similarity index 86%
rename from flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteRuntimeTest.java
rename to flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteRuntimeTest.java
index e889604..bed62c5 100644
--- a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteRuntimeTest.java
+++ b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteRuntimeTest.java
@@ -1,12 +1,12 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
-import dev.relism.ext.view.core.GlobalValue;
-import dev.relism.ext.view.core.RenderedView;
-import dev.relism.ext.view.core.ViewModel;
-import dev.relism.ext.view.jte.model.HomePage;
-import dev.relism.http.ContentType;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
+import dev.relism.flash.ext.view.core.GlobalValue;
+import dev.relism.flash.ext.view.core.RenderedView;
+import dev.relism.flash.ext.view.core.ViewModel;
+import dev.relism.flash.ext.view.jte.model.HomePage;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
import org.junit.jupiter.api.Test;
import java.util.List;
diff --git a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteSettingsTest.java b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteSettingsTest.java
similarity index 97%
rename from flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteSettingsTest.java
rename to flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteSettingsTest.java
index bf59fb9..1a610f3 100644
--- a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteSettingsTest.java
+++ b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteSettingsTest.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
-import dev.relism.Flash;
+import dev.relism.flash.Flash;
import org.junit.jupiter.api.Test;
import java.nio.file.Path;
diff --git a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteTargetResolverTest.java b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteTargetResolverTest.java
similarity index 89%
rename from flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteTargetResolverTest.java
rename to flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteTargetResolverTest.java
index 27b4ebd..dbaaa6f 100644
--- a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/JteTargetResolverTest.java
+++ b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/JteTargetResolverTest.java
@@ -1,10 +1,10 @@
-package dev.relism.ext.view.jte;
+package dev.relism.flash.ext.view.jte;
-import dev.relism.http.ContentType;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.Response;
-import dev.relism.routing.GET;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.routing.GET;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/model/HomePage.java b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/model/HomePage.java
similarity index 55%
rename from flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/model/HomePage.java
rename to flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/model/HomePage.java
index d829be6..7dbdc89 100644
--- a/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/ext/view/jte/model/HomePage.java
+++ b/flash-extensions/flash-ext-view-jte/src/test/java/dev/relism/flash/ext/view/jte/model/HomePage.java
@@ -1,3 +1,3 @@
-package dev.relism.ext.view.jte.model;
+package dev.relism.flash.ext.view.jte.model;
public record HomePage(String title, String author) {}
diff --git a/flash-extensions/flash-ext-view-jte/src/test/resources/templates/pages/home.jte b/flash-extensions/flash-ext-view-jte/src/test/resources/templates/pages/home.jte
index 2ea188d..7106021 100644
--- a/flash-extensions/flash-ext-view-jte/src/test/resources/templates/pages/home.jte
+++ b/flash-extensions/flash-ext-view-jte/src/test/resources/templates/pages/home.jte
@@ -1,4 +1,4 @@
-@import dev.relism.ext.view.jte.model.HomePage
+@import dev.relism.flash.ext.view.jte.model.HomePage
@import java.util.Map
@param HomePage page
@param String build
diff --git a/flash-extensions/flash-ext-view-thymeleaf/README.md b/flash-extensions/flash-ext-view-thymeleaf/README.md
index 39ffe03..7db6a1a 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/README.md
+++ b/flash-extensions/flash-ext-view-thymeleaf/README.md
@@ -16,28 +16,40 @@ fragment selection via `template :: fragment`) while keeping Flash boot-time fai
## Quick Start
```java
-import dev.relism.extension.FlashApp;
-import dev.relism.ext.view.core.ViewModel;
-import dev.relism.ext.view.thymeleaf.*;
+import thymeleaf.view.ext.dev.relism.flash.ThymeleafExtension;
FlashApp.create(8080)
- .install(new ThymeleafExtension()
- .addGlobal("appName", req -> "Flash")
- .addGlobal("requestPath", req -> req.path()))
- .scan("com.example.web")
- .startAndBlock();
+ .
+
+install(new ThymeleafExtension()
+ .
+
+addGlobal("appName",req ->"Flash")
+ .
+
+addGlobal("requestPath",req ->req.
+
+path()))
+ .
+
+scan("com.example.web")
+ .
+
+startAndBlock();
```
```java
-import dev.relism.ext.view.core.ViewModel;
-import dev.relism.ext.view.thymeleaf.*;
-import dev.relism.routing.GET;
+import thymeleaf.view.ext.dev.relism.flash.Template;
+import thymeleaf.view.ext.dev.relism.flash.ThymeleafHandler;
+import core.view.ext.dev.relism.flash.ViewModel;
+import models.dev.relism.flash.Request;
+import routing.dev.relism.flash.GET;
@GET("/")
@Template("pages/home")
public final class HomePage extends ThymeleafHandler {
@Override
- public ViewModel render(dev.relism.models.Request req) {
+ public ViewModel render(Request req) {
return ViewModel.of("title", "Home");
}
}
@@ -46,11 +58,13 @@ public final class HomePage extends ThymeleafHandler {
## Fragment Example
```java
+import models.dev.relism.flash.Request;
+
@GET("/users/rows")
@Fragment(template = "fragments/users", value = "rows")
public final class UserRows extends ThymeleafHandler {
@Override
- public ViewModel render(dev.relism.models.Request req) {
+ public ViewModel render(Request req) {
return ViewModel.of("users", List.of());
}
}
diff --git a/flash-extensions/flash-ext-view-thymeleaf/docs/fragments.md b/flash-extensions/flash-ext-view-thymeleaf/docs/fragments.md
index cc5c619..c3d13df 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/docs/fragments.md
+++ b/flash-extensions/flash-ext-view-thymeleaf/docs/fragments.md
@@ -3,11 +3,13 @@
Use `@Fragment` for Thymeleaf fragment responses.
```java
+import models.dev.relism.flash.Request;
+
@GET("/users/table")
@Fragment(template = "fragments/users", value = "rows")
public final class UsersRows extends ThymeleafHandler {
@Override
- public ViewModel render(dev.relism.models.Request req) {
+ public ViewModel render(Request req) {
return ViewModel.of("users", List.of());
}
}
diff --git a/flash-extensions/flash-ext-view-thymeleaf/docs/handlers.md b/flash-extensions/flash-ext-view-thymeleaf/docs/handlers.md
index 874729a..9652825 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/docs/handlers.md
+++ b/flash-extensions/flash-ext-view-thymeleaf/docs/handlers.md
@@ -12,6 +12,8 @@ Use `onViewInit()` to cache dependencies via `require(...)`.
## Example
```java
+import models.dev.relism.flash.Request;
+
@GET("/dashboard")
@Template("pages/dashboard")
public final class DashboardPage extends ThymeleafHandler {
@@ -24,10 +26,10 @@ public final class DashboardPage extends ThymeleafHandler {
}
@Override
- public ViewModel render(dev.relism.models.Request req) {
+ public ViewModel render(Request req) {
return ViewModel.empty()
- .with("title", "Dashboard")
- .with("stats", service.stats());
+ .with("title", "Dashboard")
+ .with("stats", service.stats());
}
}
```
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/Fragment.java b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/Fragment.java
similarity index 89%
rename from flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/Fragment.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/Fragment.java
index 010f18f..ee2489e 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/Fragment.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/Fragment.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/Template.java b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/Template.java
similarity index 87%
rename from flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/Template.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/Template.java
index f7730c1..49d1afd 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/Template.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/Template.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafExtension.java b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafExtension.java
similarity index 85%
rename from flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafExtension.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafExtension.java
index 23561dc..823223e 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafExtension.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafExtension.java
@@ -1,9 +1,10 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.ext.view.core.BaseViewExtension;
-import dev.relism.ext.view.core.GlobalValue;
-import dev.relism.ext.view.core.ViewRuntimeBridge;
-import dev.relism.models.RequestHandler;
+import dev.relism.flash.ext.view.core.BaseViewExtension;
+import dev.relism.flash.ext.view.core.GlobalValue;
+import dev.relism.flash.ext.view.core.ViewRuntimeBridge;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
import java.util.List;
import java.util.function.Consumer;
@@ -33,7 +34,7 @@ public class ThymeleafExtension extends BaseViewExtension {
}
@Override
- public ThymeleafExtension addGlobal(String key, java.util.function.Function resolver) {
+ public ThymeleafExtension addGlobal(String key, java.util.function.Function resolver) {
super.addGlobal(key, resolver);
return this;
}
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafHandler.java b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafHandler.java
similarity index 58%
rename from flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafHandler.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafHandler.java
index 46fcd6d..4db6348 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafHandler.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafHandler.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.ext.view.core.BaseViewHandler;
+import dev.relism.flash.ext.view.core.BaseViewHandler;
/**
* Base class for class-based Thymeleaf handlers.
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafRuntime.java b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafRuntime.java
similarity index 94%
rename from flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafRuntime.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafRuntime.java
index 163ab99..9b2509e 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafRuntime.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafRuntime.java
@@ -1,12 +1,12 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.ext.view.core.BaseViewHandler;
-import dev.relism.ext.view.core.GlobalValue;
-import dev.relism.ext.view.core.RenderedView;
-import dev.relism.ext.view.core.ViewModel;
-import dev.relism.ext.view.core.ViewRuntimeBridge;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
+import dev.relism.flash.ext.view.core.BaseViewHandler;
+import dev.relism.flash.ext.view.core.GlobalValue;
+import dev.relism.flash.ext.view.core.RenderedView;
+import dev.relism.flash.ext.view.core.ViewModel;
+import dev.relism.flash.ext.view.core.ViewRuntimeBridge;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
import org.thymeleaf.TemplateEngine;
import org.thymeleaf.context.Context;
import org.thymeleaf.context.IExpressionContext;
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafSettings.java b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafSettings.java
similarity index 97%
rename from flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafSettings.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafSettings.java
index c782e13..fb93761 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafSettings.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafSettings.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.Flash;
+import dev.relism.flash.Flash;
import org.thymeleaf.templatemode.TemplateMode;
/**
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafTarget.java b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafTarget.java
similarity index 68%
rename from flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafTarget.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafTarget.java
index fb3473a..9061bae 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafTarget.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafTarget.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.http.ContentType;
+import dev.relism.flash.http.ContentType;
record ThymeleafTarget(
Kind kind,
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafTargetResolver.java b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafTargetResolver.java
similarity index 93%
rename from flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafTargetResolver.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafTargetResolver.java
index fa231d5..d98f920 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/ext/view/thymeleaf/ThymeleafTargetResolver.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/main/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafTargetResolver.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.http.ContentType;
-import dev.relism.routing.Route;
-import dev.relism.routing.Routes;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.routing.Route;
+import dev.relism.flash.routing.Routes;
final class ThymeleafTargetResolver {
private ThymeleafTargetResolver() {}
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafExtensionTest.java b/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafExtensionTest.java
similarity index 91%
rename from flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafExtensionTest.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafExtensionTest.java
index e1b58bc..de3ac37 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafExtensionTest.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafExtensionTest.java
@@ -1,10 +1,10 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.ext.view.core.ViewModel;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.Response;
-import dev.relism.routing.GET;
+import dev.relism.flash.ext.view.core.ViewModel;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.routing.GET;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Method;
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafRuntimeTest.java b/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafRuntimeTest.java
similarity index 94%
rename from flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafRuntimeTest.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafRuntimeTest.java
index 1f5c61e..61b587f 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafRuntimeTest.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafRuntimeTest.java
@@ -1,11 +1,12 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.ext.view.core.GlobalValue;
-import dev.relism.ext.view.core.RenderedView;
-import dev.relism.ext.view.core.ViewModel;
-import dev.relism.http.ContentType;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
+import dev.relism.flash.ext.view.core.GlobalValue;
+import dev.relism.flash.ext.view.core.RenderedView;
+import dev.relism.flash.ext.view.core.ViewModel;
+import dev.relism.flash.routing.GET;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
import org.junit.jupiter.api.Test;
import org.thymeleaf.templatemode.TemplateMode;
@@ -135,7 +136,7 @@ class ThymeleafRuntimeTest {
assertFalse(settings.cacheEnabled());
}
- @dev.relism.routing.GET("/cached")
+ @GET("/cached")
@Template("pages/home")
static class CachedTemplateHandler extends ThymeleafHandler {
@Override
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafSettingsTest.java b/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafSettingsTest.java
similarity index 95%
rename from flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafSettingsTest.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafSettingsTest.java
index 9546a70..8529739 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafSettingsTest.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafSettingsTest.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.Flash;
+import dev.relism.flash.Flash;
import org.junit.jupiter.api.Test;
import org.thymeleaf.templatemode.TemplateMode;
diff --git a/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafTargetResolverTest.java b/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafTargetResolverTest.java
similarity index 92%
rename from flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafTargetResolverTest.java
rename to flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafTargetResolverTest.java
index d72d59f..273d873 100644
--- a/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/ext/view/thymeleaf/ThymeleafTargetResolverTest.java
+++ b/flash-extensions/flash-ext-view-thymeleaf/src/test/java/dev/relism/flash/ext/view/thymeleaf/ThymeleafTargetResolverTest.java
@@ -1,9 +1,9 @@
-package dev.relism.ext.view.thymeleaf;
+package dev.relism.flash.ext.view.thymeleaf;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.Response;
-import dev.relism.routing.GET;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.routing.GET;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/flash-extensions/flash-web-bundler/docs/README.md b/flash-extensions/flash-ext-web-bundler/docs/README.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/README.md
rename to flash-extensions/flash-ext-web-bundler/docs/README.md
diff --git a/flash-extensions/flash-web-bundler/docs/asset-sources.md b/flash-extensions/flash-ext-web-bundler/docs/asset-sources.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/asset-sources.md
rename to flash-extensions/flash-ext-web-bundler/docs/asset-sources.md
diff --git a/flash-extensions/flash-web-bundler/docs/configuration.md b/flash-extensions/flash-ext-web-bundler/docs/configuration.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/configuration.md
rename to flash-extensions/flash-ext-web-bundler/docs/configuration.md
diff --git a/flash-extensions/flash-web-bundler/docs/dev-lifecycle.md b/flash-extensions/flash-ext-web-bundler/docs/dev-lifecycle.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/dev-lifecycle.md
rename to flash-extensions/flash-ext-web-bundler/docs/dev-lifecycle.md
diff --git a/flash-extensions/flash-web-bundler/docs/frontend-selection.md b/flash-extensions/flash-ext-web-bundler/docs/frontend-selection.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/frontend-selection.md
rename to flash-extensions/flash-ext-web-bundler/docs/frontend-selection.md
diff --git a/flash-extensions/flash-web-bundler/docs/modes.md b/flash-extensions/flash-ext-web-bundler/docs/modes.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/modes.md
rename to flash-extensions/flash-ext-web-bundler/docs/modes.md
diff --git a/flash-extensions/flash-web-bundler/docs/package-managers.md b/flash-extensions/flash-ext-web-bundler/docs/package-managers.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/package-managers.md
rename to flash-extensions/flash-ext-web-bundler/docs/package-managers.md
diff --git a/flash-extensions/flash-web-bundler/docs/performance.md b/flash-extensions/flash-ext-web-bundler/docs/performance.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/performance.md
rename to flash-extensions/flash-ext-web-bundler/docs/performance.md
diff --git a/flash-extensions/flash-web-bundler/docs/prod-serving.md b/flash-extensions/flash-ext-web-bundler/docs/prod-serving.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/prod-serving.md
rename to flash-extensions/flash-ext-web-bundler/docs/prod-serving.md
diff --git a/flash-extensions/flash-web-bundler/docs/routing-fallback.md b/flash-extensions/flash-ext-web-bundler/docs/routing-fallback.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/routing-fallback.md
rename to flash-extensions/flash-ext-web-bundler/docs/routing-fallback.md
diff --git a/flash-extensions/flash-web-bundler/docs/security-policies.md b/flash-extensions/flash-ext-web-bundler/docs/security-policies.md
similarity index 100%
rename from flash-extensions/flash-web-bundler/docs/security-policies.md
rename to flash-extensions/flash-ext-web-bundler/docs/security-policies.md
diff --git a/flash-extensions/flash-web-bundler/pom.xml b/flash-extensions/flash-ext-web-bundler/pom.xml
similarity index 95%
rename from flash-extensions/flash-web-bundler/pom.xml
rename to flash-extensions/flash-ext-web-bundler/pom.xml
index e425d0d..dcdec5b 100644
--- a/flash-extensions/flash-web-bundler/pom.xml
+++ b/flash-extensions/flash-ext-web-bundler/pom.xml
@@ -10,7 +10,7 @@
1.1-indev6
- flash-web-bundler
+ flash-ext-web-bundler
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetCatalog.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetCatalog.java
similarity index 94%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetCatalog.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetCatalog.java
index 358eb6b..d5dd346 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetCatalog.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetCatalog.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.util.Map;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetEntry.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetEntry.java
similarity index 79%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetEntry.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetEntry.java
index 30fa765..46bde2b 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetEntry.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetEntry.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
public record AssetEntry(
byte[] raw,
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetIo.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetIo.java
similarity index 98%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetIo.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetIo.java
index b1d2fa6..3cbaeaa 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetIo.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetIo.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.io.IOException;
import java.io.InputStream;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetLoadRequest.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetLoadRequest.java
similarity index 93%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetLoadRequest.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetLoadRequest.java
index 939c1e6..eb88e56 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetLoadRequest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetLoadRequest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.nio.file.Path;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetMetadata.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetMetadata.java
similarity index 93%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetMetadata.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetMetadata.java
index 1628ad6..4e8d8a3 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetMetadata.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetMetadata.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
record AssetMetadata(
String routePath,
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetPaths.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetPaths.java
similarity index 95%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetPaths.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetPaths.java
index 7f7b9cb..7761eac 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetPaths.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetPaths.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
final class AssetPaths {
private AssetPaths() {
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetsSource.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetsSource.java
similarity index 67%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetsSource.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetsSource.java
index 1f107d0..4660b1e 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetsSource.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetsSource.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
public interface AssetsSource {
AssetCatalog load(AssetLoadRequest request);
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetsSources.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetsSources.java
similarity index 89%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetsSources.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetsSources.java
index ad7712e..6fe119e 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/AssetsSources.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/AssetsSources.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.nio.file.Path;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/BasePathEnforcementMode.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/BasePathEnforcementMode.java
similarity index 62%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/BasePathEnforcementMode.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/BasePathEnforcementMode.java
index 6c9bb87..b7b8c0d 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/BasePathEnforcementMode.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/BasePathEnforcementMode.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
public enum BasePathEnforcementMode {
WARN_ONLY,
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ClasspathAssetManifest.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ClasspathAssetManifest.java
similarity index 91%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ClasspathAssetManifest.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ClasspathAssetManifest.java
index 64b1958..367e468 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ClasspathAssetManifest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ClasspathAssetManifest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ClasspathAssetsSource.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ClasspathAssetsSource.java
similarity index 99%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ClasspathAssetsSource.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ClasspathAssetsSource.java
index 992ab17..571cd99 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ClasspathAssetsSource.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ClasspathAssetsSource.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.io.IOException;
import java.io.InputStream;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandOrchestrator.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandOrchestrator.java
similarity index 99%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandOrchestrator.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandOrchestrator.java
index e4412ea..fd1a871 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandOrchestrator.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandOrchestrator.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandSafetyMode.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandSafetyMode.java
similarity index 61%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandSafetyMode.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandSafetyMode.java
index e8addfc..61882bd 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandSafetyMode.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandSafetyMode.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
public enum CommandSafetyMode {
WARN,
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandSafetyPolicy.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandSafetyPolicy.java
similarity index 95%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandSafetyPolicy.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandSafetyPolicy.java
index 120134a..9169101 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandSafetyPolicy.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandSafetyPolicy.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandTokens.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandTokens.java
similarity index 87%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandTokens.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandTokens.java
index dd04944..8f1a11d 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/CommandTokens.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/CommandTokens.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.util.Arrays;
import java.util.List;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FilesystemAssetsSource.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FilesystemAssetsSource.java
similarity index 98%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FilesystemAssetsSource.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FilesystemAssetsSource.java
index 6a7e0ec..1530378 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FilesystemAssetsSource.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FilesystemAssetsSource.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FrontendStrategy.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FrontendStrategy.java
similarity index 88%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FrontendStrategy.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FrontendStrategy.java
index 419d90b..691047b 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FrontendStrategy.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FrontendStrategy.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.util.List;
diff --git a/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FrontendType.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FrontendType.java
new file mode 100644
index 0000000..c39d37d
--- /dev/null
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FrontendType.java
@@ -0,0 +1,5 @@
+package dev.relism.flash.ext.webbundler;
+
+public enum FrontendType {
+ VITE
+}
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FrontendTypeResolver.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FrontendTypeResolver.java
similarity index 94%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FrontendTypeResolver.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FrontendTypeResolver.java
index 0d04a8a..e596fae 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FrontendTypeResolver.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/FrontendTypeResolver.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.util.EnumMap;
import java.util.Map;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/InstallCache.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/InstallCache.java
similarity index 97%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/InstallCache.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/InstallCache.java
index 470a89f..9241631 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/InstallCache.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/InstallCache.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/InstallPolicy.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/InstallPolicy.java
similarity index 63%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/InstallPolicy.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/InstallPolicy.java
index d30d5d6..e271cda 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/InstallPolicy.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/InstallPolicy.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
public enum InstallPolicy {
AUTO_IF_LOCK_HASH_CHANGED,
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/LoggingMode.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/LoggingMode.java
similarity index 65%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/LoggingMode.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/LoggingMode.java
index cffb10e..3134e89 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/LoggingMode.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/LoggingMode.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
public enum LoggingMode {
MERGED,
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/MimeTypes.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/MimeTypes.java
similarity index 96%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/MimeTypes.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/MimeTypes.java
index d94c9b3..75db7f2 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/MimeTypes.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/MimeTypes.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.util.Map;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ModeResolver.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ModeResolver.java
similarity index 90%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ModeResolver.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ModeResolver.java
index 7e60c70..4f04904 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ModeResolver.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ModeResolver.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
-import dev.relism.Flash;
+import dev.relism.flash.Flash;
final class ModeResolver {
RuntimeEnvironment resolve(WebBundlerConfig config) {
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/OperationMode.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/OperationMode.java
similarity index 61%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/OperationMode.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/OperationMode.java
index 21bfb9e..7d4cfa8 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/OperationMode.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/OperationMode.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
public enum OperationMode {
ORCHESTRATE_ONLY,
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/PackageManager.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/PackageManager.java
similarity index 92%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/PackageManager.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/PackageManager.java
index 92e9375..0199419 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/PackageManager.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/PackageManager.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
public enum PackageManager {
NPM("npm", "package-lock.json"),
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/PackageManagerAdapter.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/PackageManagerAdapter.java
similarity index 97%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/PackageManagerAdapter.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/PackageManagerAdapter.java
index fabadf9..53bb798 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/PackageManagerAdapter.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/PackageManagerAdapter.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.util.List;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/RuntimeEnvironment.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/RuntimeEnvironment.java
similarity index 53%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/RuntimeEnvironment.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/RuntimeEnvironment.java
index fd59822..7050be5 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/RuntimeEnvironment.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/RuntimeEnvironment.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
enum RuntimeEnvironment {
DEV,
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/RuntimeMode.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/RuntimeMode.java
similarity index 60%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/RuntimeMode.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/RuntimeMode.java
index ab2631c..bda8e72 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/RuntimeMode.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/RuntimeMode.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
public enum RuntimeMode {
PROD,
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/SpaFallbackPolicy.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/SpaFallbackPolicy.java
similarity index 79%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/SpaFallbackPolicy.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/SpaFallbackPolicy.java
index c6def81..0f8f799 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/SpaFallbackPolicy.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/SpaFallbackPolicy.java
@@ -1,6 +1,6 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
-import dev.relism.models.Response;
+import dev.relism.flash.models.Response;
final class SpaFallbackPolicy {
private final byte[] html;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/StaticAssetServingPolicy.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/StaticAssetServingPolicy.java
similarity index 89%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/StaticAssetServingPolicy.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/StaticAssetServingPolicy.java
index bee76a7..105616b 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/StaticAssetServingPolicy.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/StaticAssetServingPolicy.java
@@ -1,8 +1,8 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
-import dev.relism.http.HttpStatus;
-import dev.relism.models.Request;
-import dev.relism.models.Response;
+import dev.relism.flash.http.HttpStatus;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
final class StaticAssetServingPolicy {
private final AssetCatalog catalog;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ViteFrontendStrategy.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ViteFrontendStrategy.java
similarity index 94%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ViteFrontendStrategy.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ViteFrontendStrategy.java
index 492a468..e49cbe7 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/ViteFrontendStrategy.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/ViteFrontendStrategy.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.util.List;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WatchList.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WatchList.java
similarity index 96%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WatchList.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WatchList.java
index b206d24..defd640 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WatchList.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WatchList.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WebBundlerConfig.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WebBundlerConfig.java
similarity index 99%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WebBundlerConfig.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WebBundlerConfig.java
index a3b21c1..5a881df 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WebBundlerConfig.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WebBundlerConfig.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import java.nio.file.Path;
import java.util.ArrayList;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WebBundlerExtension.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WebBundlerExtension.java
similarity index 96%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WebBundlerExtension.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WebBundlerExtension.java
index 12c4030..fc8d274 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WebBundlerExtension.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WebBundlerExtension.java
@@ -1,9 +1,9 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
-import dev.relism.extension.ExtensionPhase;
-import dev.relism.extension.FlashContext;
-import dev.relism.extension.FlashExtension;
-import dev.relism.extension.FlashRegistrar;
+import dev.relism.flash.extension.ExtensionPhase;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.extension.FlashExtension;
+import dev.relism.flash.extension.FlashRegistrar;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WebBundlerRuntime.java b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WebBundlerRuntime.java
similarity index 96%
rename from flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WebBundlerRuntime.java
rename to flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WebBundlerRuntime.java
index 53aa9ee..b825de2 100644
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/WebBundlerRuntime.java
+++ b/flash-extensions/flash-ext-web-bundler/src/main/java/dev/relism/flash/ext/webbundler/WebBundlerRuntime.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
final class WebBundlerRuntime {
private final RuntimeEnvironment environment;
diff --git a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/AssetsSourceTest.java b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/AssetsSourceTest.java
similarity index 97%
rename from flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/AssetsSourceTest.java
rename to flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/AssetsSourceTest.java
index 5f6eff7..9ca7522 100644
--- a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/AssetsSourceTest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/AssetsSourceTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/CommandSafetyPolicyTest.java b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/CommandSafetyPolicyTest.java
similarity index 96%
rename from flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/CommandSafetyPolicyTest.java
rename to flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/CommandSafetyPolicyTest.java
index 9f715aa..4d7d9a6 100644
--- a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/CommandSafetyPolicyTest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/CommandSafetyPolicyTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import org.junit.jupiter.api.Test;
diff --git a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/InstallCacheTest.java b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/InstallCacheTest.java
similarity index 95%
rename from flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/InstallCacheTest.java
rename to flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/InstallCacheTest.java
index 5c8885a..24f8e53 100644
--- a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/InstallCacheTest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/InstallCacheTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/ModeResolverTest.java b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/ModeResolverTest.java
similarity index 91%
rename from flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/ModeResolverTest.java
rename to flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/ModeResolverTest.java
index 29bf54a..7b8e248 100644
--- a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/ModeResolverTest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/ModeResolverTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import org.junit.jupiter.api.Test;
diff --git a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/PackageManagerAdapterTest.java b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/PackageManagerAdapterTest.java
similarity index 93%
rename from flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/PackageManagerAdapterTest.java
rename to flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/PackageManagerAdapterTest.java
index 236770b..3cbe93b 100644
--- a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/PackageManagerAdapterTest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/PackageManagerAdapterTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import org.junit.jupiter.api.Test;
diff --git a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/WebBundlerConfigTest.java b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/WebBundlerConfigTest.java
similarity index 97%
rename from flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/WebBundlerConfigTest.java
rename to flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/WebBundlerConfigTest.java
index 4f2776c..6be98d8 100644
--- a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/WebBundlerConfigTest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/WebBundlerConfigTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import org.junit.jupiter.api.Test;
diff --git a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/WebBundlerExtensionDevGuardTest.java b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/WebBundlerExtensionDevGuardTest.java
similarity index 91%
rename from flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/WebBundlerExtensionDevGuardTest.java
rename to flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/WebBundlerExtensionDevGuardTest.java
index a9a3f22..45e0c2a 100644
--- a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/WebBundlerExtensionDevGuardTest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/WebBundlerExtensionDevGuardTest.java
@@ -1,4 +1,4 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
import org.junit.jupiter.api.Test;
diff --git a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/WebBundlerExtensionIntegrationTest.java b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/WebBundlerExtensionIntegrationTest.java
similarity index 95%
rename from flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/WebBundlerExtensionIntegrationTest.java
rename to flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/WebBundlerExtensionIntegrationTest.java
index 2dbedf6..a09fec6 100644
--- a/flash-extensions/flash-web-bundler/src/test/java/dev/relism/ext/webbundler/WebBundlerExtensionIntegrationTest.java
+++ b/flash-extensions/flash-ext-web-bundler/src/test/java/dev/relism/flash/ext/webbundler/WebBundlerExtensionIntegrationTest.java
@@ -1,7 +1,6 @@
-package dev.relism.ext.webbundler;
+package dev.relism.flash.ext.webbundler;
-import dev.relism.extension.FlashApp;
-import dev.relism.extension.FlashConfiguration;
+import dev.relism.flash.extension.FlashApp;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FrontendType.java b/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FrontendType.java
deleted file mode 100644
index 8215e6f..0000000
--- a/flash-extensions/flash-web-bundler/src/main/java/dev/relism/ext/webbundler/FrontendType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package dev.relism.ext.webbundler;
-
-public enum FrontendType {
- VITE
-}
diff --git a/flash-extensions/pom.xml b/flash-extensions/pom.xml
index 0cb6949..c3020fc 100644
--- a/flash-extensions/pom.xml
+++ b/flash-extensions/pom.xml
@@ -22,7 +22,10 @@
flash-ext-view-jte
flash-ext-view-thymeleaf
flash-ext-limiter
- flash-web-bundler
+ flash-ext-web-bundler
+ flash-ext-data-core
+ flash-ext-data-jdbc
+ flash-ext-data-hibernate
@@ -64,9 +67,61 @@
dev.relism
- flash-web-bundler
+ flash-ext-web-bundler
${project.version}
+
+ dev.relism
+ flash-ext-data-core
+ ${project.version}
+
+
+ dev.relism
+ flash-ext-data-jdbc
+ ${project.version}
+
+
+ dev.relism
+ flash-ext-data-hibernate
+ ${project.version}
+
+
+ com.zaxxer
+ HikariCP
+ 6.3.0
+
+
+ org.hibernate.orm
+ hibernate-core
+ 6.6.35.Final
+
+
+ org.testcontainers
+ postgresql
+ 1.21.3
+ test
+
+
+ com.h2database
+ h2
+ 2.2.224
+ test
+
+
+ jakarta.transaction
+ jakarta.transaction-api
+ 2.0.1
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ 3.0.0
+
+
+ jakarta.validation
+ jakarta.validation-api
+ 3.1.1
+
diff --git a/flash/src/main/java/dev/relism/Flash.java b/flash/src/main/java/dev/relism/Flash.java
deleted file mode 100644
index 513976c..0000000
--- a/flash/src/main/java/dev/relism/Flash.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package dev.relism;
-
-/**
- * Global Flash constants and runtime environment flags.
- *
- * Dev mode
- * Set via JVM property {@code -Dflash.env=dev} or environment variable {@code FLASH_ENV=dev}.
- * Checked once at class load — zero runtime overhead.
- *
- * Dev mode enables:
- *
- * - HTML error pages with full stack traces (default: JSON generic responses in prod)
- * - Template cache disabled in {@code flash-ext-view-thymeleaf}
- *
- *
- * Extensions can read {@link #DEV} to branch behavior without re-implementing the detection:
- *
{@code
- * if (Flash.DEV) log.debug("Verbose OIDC debug output enabled");
- * }
- */
-public final class Flash {
-
- private Flash() {}
-
- public static final String VERSION = "5.0.0-dev";
-
- /**
- * {@code true} when running in dev mode.
- * Set via {@code -Dflash.env=dev} (JVM property) or {@code FLASH_ENV=dev} (env var).
- * JVM property takes precedence.
- */
- public static final boolean DEV;
-
- static {
- String prop = System.getProperty("flash.env");
- DEV = "dev".equalsIgnoreCase(prop != null ? prop : System.getenv("FLASH_ENV"));
- }
-}
diff --git a/flash/src/main/java/dev/relism/ChunkedInputStream.java b/flash/src/main/java/dev/relism/flash/ChunkedInputStream.java
similarity index 99%
rename from flash/src/main/java/dev/relism/ChunkedInputStream.java
rename to flash/src/main/java/dev/relism/flash/ChunkedInputStream.java
index 4d5b4c4..492dc7d 100644
--- a/flash/src/main/java/dev/relism/ChunkedInputStream.java
+++ b/flash/src/main/java/dev/relism/flash/ChunkedInputStream.java
@@ -1,4 +1,4 @@
-package dev.relism;
+package dev.relism.flash;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/flash/src/main/java/dev/relism/flash/Flash.java b/flash/src/main/java/dev/relism/flash/Flash.java
new file mode 100644
index 0000000..d26c955
--- /dev/null
+++ b/flash/src/main/java/dev/relism/flash/Flash.java
@@ -0,0 +1,88 @@
+package dev.relism.flash;
+
+import dev.relism.flash.routing.Middleware;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+/**
+ * Global Flash constants and runtime environment flags.
+ *
+ * Dev mode
+ * Set via JVM property {@code -Dflash.env=dev} or environment variable {@code FLASH_ENV=dev}.
+ * Checked once at classloading — zero runtime overhead.
+ *
+ * Dev mode enables:
+ *
+ * - HTML error pages with full stack traces (default: JSON generic responses in prod)
+ * - Template cache disabled in {@code flash-ext-view-thymeleaf}
+ *
+ *
+ */
+public final class Flash {
+
+ private Flash() {}
+
+ public static final String VERSION = "5.0.0-dev";
+ public static final Commons commons;
+
+ public static final boolean DEV;
+
+ static {
+ String prop = System.getProperty("flash.env");
+ DEV = "dev".equalsIgnoreCase(prop != null ? prop : System.getenv("FLASH_ENV"));
+ commons = new Commons();
+ }
+
+ public static class Commons {
+ public final Middlewares middlewares = new Middlewares();
+ }
+
+ public static class Middlewares {
+
+ public static class CorsConfig {
+ private String origin = "*";
+ private List methods = new ArrayList<>(List.of("GET","POST","PUT","DELETE","OPTIONS"));
+ private List headers = new ArrayList<>(List.of("*"));
+ private boolean credentials = false;
+
+ public CorsConfig origin(String v) { this.origin = v; return this; }
+ public CorsConfig methods(String... v) { this.methods = new ArrayList<>(List.of(v)); return this; }
+ public CorsConfig headers(String... v) { this.headers = new ArrayList<>(List.of(v)); return this; }
+ public CorsConfig credentials(boolean v) { this.credentials = v; return this; }
+
+ public String origin() { return origin; }
+ public List methods() { return methods; }
+ public List headers() { return headers; }
+ public boolean credentials() { return credentials; }
+ }
+
+ public Middleware cors(CorsConfig config) {
+ return next -> (req, res) -> {
+ res.header("Access-Control-Allow-Origin", config.origin())
+ .header("Access-Control-Allow-Methods", String.join(", ", config.methods()));
+
+ if (!config.headers().isEmpty()) {
+ res.header("Access-Control-Allow-Headers", String.join(", ", config.headers()));
+ }
+ if (config.credentials()) {
+ res.header("Access-Control-Allow-Credentials", "true");
+ }
+ return next.handle(req, res);
+ };
+ }
+
+ // stile lambda
+ public Middleware cors(Consumer fn) {
+ CorsConfig cfg = new CorsConfig(); // default già settati
+ fn.accept(cfg);
+ return cors(cfg);
+ }
+
+ // default
+ public Middleware cors() {
+ return cors(new CorsConfig());
+ }
+ }
+}
\ No newline at end of file
diff --git a/flash/src/main/java/dev/relism/HttpServer.java b/flash/src/main/java/dev/relism/flash/HttpServer.java
similarity index 95%
rename from flash/src/main/java/dev/relism/HttpServer.java
rename to flash/src/main/java/dev/relism/flash/HttpServer.java
index 34244eb..64518b5 100644
--- a/flash/src/main/java/dev/relism/HttpServer.java
+++ b/flash/src/main/java/dev/relism/flash/HttpServer.java
@@ -1,11 +1,14 @@
-package dev.relism;
+package dev.relism.flash;
+import dev.relism.flash.extension.FlashApp;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
import dev.relism.fpr.core.ByteView;
-import dev.relism.http.ContentType;
-import dev.relism.http.HttpStatus;
-import dev.relism.models.*;
-import dev.relism.extension.FlashConfiguration;
-import dev.relism.routing.AbstractRouter;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.http.HttpStatus;
+import dev.relism.flash.extension.FlashConfiguration;
+import dev.relism.flash.routing.AbstractRouter;
import lombok.extern.slf4j.Slf4j;
@@ -28,7 +31,7 @@ import java.util.concurrent.atomic.AtomicReference;
* executor, and the keep-alive accept loop. Routing is delegated to a single
* {@link AbstractRouter}.
*
- * Package-private : use {@link dev.relism.extension.FlashApp} as the single
+ *
Package-private : use {@link FlashApp} as the single
* entry point.
*/
@Slf4j
diff --git a/flash/src/main/java/dev/relism/RequestParser.java b/flash/src/main/java/dev/relism/flash/RequestParser.java
similarity index 96%
rename from flash/src/main/java/dev/relism/RequestParser.java
rename to flash/src/main/java/dev/relism/flash/RequestParser.java
index da08682..0b9fa48 100644
--- a/flash/src/main/java/dev/relism/RequestParser.java
+++ b/flash/src/main/java/dev/relism/flash/RequestParser.java
@@ -1,10 +1,10 @@
-package dev.relism;
+package dev.relism.flash;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.HeaderMap;
-import dev.relism.models.Request;
-import dev.relism.models.RequestLine;
-import dev.relism.routing.routers.fastpathrouter.FastPathViews;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.HeaderMap;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestLine;
+import dev.relism.flash.routing.routers.fastpathrouter.FastPathViews;
import lombok.extern.slf4j.Slf4j;
diff --git a/flash/src/main/java/dev/relism/ServerHandle.java b/flash/src/main/java/dev/relism/flash/ServerHandle.java
similarity index 79%
rename from flash/src/main/java/dev/relism/ServerHandle.java
rename to flash/src/main/java/dev/relism/flash/ServerHandle.java
index 6a24e1a..7f7f50b 100644
--- a/flash/src/main/java/dev/relism/ServerHandle.java
+++ b/flash/src/main/java/dev/relism/flash/ServerHandle.java
@@ -1,14 +1,15 @@
-package dev.relism;
+package dev.relism.flash;
-import dev.relism.extension.FlashConfiguration;
-import dev.relism.routing.AbstractRouter;
+import dev.relism.flash.extension.FlashApp;
+import dev.relism.flash.extension.FlashConfiguration;
+import dev.relism.flash.routing.AbstractRouter;
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
/**
* Public handle to the underlying HTTP transport. Returned by {@link #create}
- * so that {@link dev.relism.extension.FlashApp} can start and stop the server
+ * so that {@link FlashApp} can start and stop the server
* without holding a direct reference to the package-private {@link HttpServer}.
*/
public interface ServerHandle {
diff --git a/flash/src/main/java/dev/relism/api/multipart/Multipart.java b/flash/src/main/java/dev/relism/flash/api/multipart/Multipart.java
similarity index 99%
rename from flash/src/main/java/dev/relism/api/multipart/Multipart.java
rename to flash/src/main/java/dev/relism/flash/api/multipart/Multipart.java
index d4c05fb..ceea189 100644
--- a/flash/src/main/java/dev/relism/api/multipart/Multipart.java
+++ b/flash/src/main/java/dev/relism/flash/api/multipart/Multipart.java
@@ -1,6 +1,6 @@
-package dev.relism.api.multipart;
+package dev.relism.flash.api.multipart;
-import dev.relism.models.Request;
+import dev.relism.flash.models.Request;
import java.io.IOException;
import java.io.InputStream;
diff --git a/flash/src/main/java/dev/relism/api/multipart/Part.java b/flash/src/main/java/dev/relism/flash/api/multipart/Part.java
similarity index 98%
rename from flash/src/main/java/dev/relism/api/multipart/Part.java
rename to flash/src/main/java/dev/relism/flash/api/multipart/Part.java
index 0e9405f..794716b 100644
--- a/flash/src/main/java/dev/relism/api/multipart/Part.java
+++ b/flash/src/main/java/dev/relism/flash/api/multipart/Part.java
@@ -1,4 +1,4 @@
-package dev.relism.api.multipart;
+package dev.relism.flash.api.multipart;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/flash/src/main/java/dev/relism/exceptions/HttpException.java b/flash/src/main/java/dev/relism/flash/exceptions/HttpException.java
similarity index 97%
rename from flash/src/main/java/dev/relism/exceptions/HttpException.java
rename to flash/src/main/java/dev/relism/flash/exceptions/HttpException.java
index 439ce97..a7084b5 100644
--- a/flash/src/main/java/dev/relism/exceptions/HttpException.java
+++ b/flash/src/main/java/dev/relism/flash/exceptions/HttpException.java
@@ -1,4 +1,4 @@
-package dev.relism.exceptions;
+package dev.relism.flash.exceptions;
/**
* Runtime exception carrying an HTTP status code. Extensions map this to a
diff --git a/flash/src/main/java/dev/relism/exceptions/InitializationException.java b/flash/src/main/java/dev/relism/flash/exceptions/InitializationException.java
similarity index 92%
rename from flash/src/main/java/dev/relism/exceptions/InitializationException.java
rename to flash/src/main/java/dev/relism/flash/exceptions/InitializationException.java
index 5a5e084..18d540d 100644
--- a/flash/src/main/java/dev/relism/exceptions/InitializationException.java
+++ b/flash/src/main/java/dev/relism/flash/exceptions/InitializationException.java
@@ -1,4 +1,4 @@
-package dev.relism.exceptions;
+package dev.relism.flash.exceptions;
/**
* Thrown at boot time when Flash detects a configuration or registration error.
diff --git a/flash/src/main/java/dev/relism/extension/AnnotationProcessor.java b/flash/src/main/java/dev/relism/flash/extension/AnnotationProcessor.java
similarity index 83%
rename from flash/src/main/java/dev/relism/extension/AnnotationProcessor.java
rename to flash/src/main/java/dev/relism/flash/extension/AnnotationProcessor.java
index 4946222..d33ce4d 100644
--- a/flash/src/main/java/dev/relism/extension/AnnotationProcessor.java
+++ b/flash/src/main/java/dev/relism/flash/extension/AnnotationProcessor.java
@@ -1,7 +1,7 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
-import dev.relism.models.RequestHandler;
-import dev.relism.routing.Middleware;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.routing.Middleware;
import java.util.List;
diff --git a/flash/src/main/java/dev/relism/extension/ExtensionPhase.java b/flash/src/main/java/dev/relism/flash/extension/ExtensionPhase.java
similarity index 96%
rename from flash/src/main/java/dev/relism/extension/ExtensionPhase.java
rename to flash/src/main/java/dev/relism/flash/extension/ExtensionPhase.java
index 2ccdcf1..39e5e07 100644
--- a/flash/src/main/java/dev/relism/extension/ExtensionPhase.java
+++ b/flash/src/main/java/dev/relism/flash/extension/ExtensionPhase.java
@@ -1,4 +1,4 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
/**
* Semantic execution phases for {@link FlashExtension#priority()}.
diff --git a/flash/src/main/java/dev/relism/extension/FlashApp.java b/flash/src/main/java/dev/relism/flash/extension/FlashApp.java
similarity index 95%
rename from flash/src/main/java/dev/relism/extension/FlashApp.java
rename to flash/src/main/java/dev/relism/flash/extension/FlashApp.java
index ffc5534..e1b56b9 100644
--- a/flash/src/main/java/dev/relism/extension/FlashApp.java
+++ b/flash/src/main/java/dev/relism/flash/extension/FlashApp.java
@@ -1,14 +1,14 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
-import dev.relism.Flash;
-import dev.relism.ServerHandle;
-import dev.relism.exceptions.InitializationException;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.SimpleHandler;
-import dev.relism.routing.AbstractRouter;
-import dev.relism.routing.Middleware;
-import dev.relism.routing.routers.fastpathrouter.FastPathRouterImpl;
+import dev.relism.flash.Flash;
+import dev.relism.flash.ServerHandle;
+import dev.relism.flash.exceptions.InitializationException;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.SimpleHandler;
+import dev.relism.flash.routing.AbstractRouter;
+import dev.relism.flash.routing.Middleware;
+import dev.relism.flash.routing.routers.fastpathrouter.FastPathRouterImpl;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
diff --git a/flash/src/main/java/dev/relism/extension/FlashConfiguration.java b/flash/src/main/java/dev/relism/flash/extension/FlashConfiguration.java
similarity index 94%
rename from flash/src/main/java/dev/relism/extension/FlashConfiguration.java
rename to flash/src/main/java/dev/relism/flash/extension/FlashConfiguration.java
index 486305b..5229b68 100644
--- a/flash/src/main/java/dev/relism/extension/FlashConfiguration.java
+++ b/flash/src/main/java/dev/relism/flash/extension/FlashConfiguration.java
@@ -1,4 +1,4 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
import lombok.Builder;
import lombok.Value;
diff --git a/flash/src/main/java/dev/relism/extension/FlashContext.java b/flash/src/main/java/dev/relism/flash/extension/FlashContext.java
similarity index 99%
rename from flash/src/main/java/dev/relism/extension/FlashContext.java
rename to flash/src/main/java/dev/relism/flash/extension/FlashContext.java
index 25ae4e3..eb21234 100644
--- a/flash/src/main/java/dev/relism/extension/FlashContext.java
+++ b/flash/src/main/java/dev/relism/flash/extension/FlashContext.java
@@ -1,4 +1,4 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
import java.util.*;
import java.util.function.Supplier;
diff --git a/flash/src/main/java/dev/relism/extension/FlashExtension.java b/flash/src/main/java/dev/relism/flash/extension/FlashExtension.java
similarity index 98%
rename from flash/src/main/java/dev/relism/extension/FlashExtension.java
rename to flash/src/main/java/dev/relism/flash/extension/FlashExtension.java
index fd0580d..e4765a2 100644
--- a/flash/src/main/java/dev/relism/extension/FlashExtension.java
+++ b/flash/src/main/java/dev/relism/flash/extension/FlashExtension.java
@@ -1,4 +1,4 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
/**
* Two-phase contract for all Flash extensions.
diff --git a/flash/src/main/java/dev/relism/extension/FlashRegistrar.java b/flash/src/main/java/dev/relism/flash/extension/FlashRegistrar.java
similarity index 93%
rename from flash/src/main/java/dev/relism/extension/FlashRegistrar.java
rename to flash/src/main/java/dev/relism/flash/extension/FlashRegistrar.java
index 9442f9c..00b9282 100644
--- a/flash/src/main/java/dev/relism/extension/FlashRegistrar.java
+++ b/flash/src/main/java/dev/relism/flash/extension/FlashRegistrar.java
@@ -1,12 +1,12 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
-import dev.relism.exceptions.InitializationException;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.SimpleHandler;
-import dev.relism.routing.Middleware;
-import dev.relism.routing.Route;
-import dev.relism.routing.Routes;
+import dev.relism.flash.exceptions.InitializationException;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.SimpleHandler;
+import dev.relism.flash.routing.Middleware;
+import dev.relism.flash.routing.Route;
+import dev.relism.flash.routing.Routes;
import java.util.List;
diff --git a/flash/src/main/java/dev/relism/extension/FlashScope.java b/flash/src/main/java/dev/relism/flash/extension/FlashScope.java
similarity index 89%
rename from flash/src/main/java/dev/relism/extension/FlashScope.java
rename to flash/src/main/java/dev/relism/flash/extension/FlashScope.java
index c9da165..57472d2 100644
--- a/flash/src/main/java/dev/relism/extension/FlashScope.java
+++ b/flash/src/main/java/dev/relism/flash/extension/FlashScope.java
@@ -1,10 +1,10 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.SimpleHandler;
-import dev.relism.routing.Middleware;
-import dev.relism.routing.PathUtils;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.SimpleHandler;
+import dev.relism.flash.routing.Middleware;
+import dev.relism.flash.routing.PathUtils;
import java.util.ArrayList;
import java.util.List;
diff --git a/flash/src/main/java/dev/relism/extension/PackageScanner.java b/flash/src/main/java/dev/relism/flash/extension/PackageScanner.java
similarity index 97%
rename from flash/src/main/java/dev/relism/extension/PackageScanner.java
rename to flash/src/main/java/dev/relism/flash/extension/PackageScanner.java
index bd98e69..1e67ebc 100644
--- a/flash/src/main/java/dev/relism/extension/PackageScanner.java
+++ b/flash/src/main/java/dev/relism/flash/extension/PackageScanner.java
@@ -1,8 +1,8 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
-import dev.relism.exceptions.InitializationException;
-import dev.relism.models.RequestHandler;
-import dev.relism.routing.Routes;
+import dev.relism.flash.exceptions.InitializationException;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.routing.Routes;
import java.io.File;
import java.net.URL;
diff --git a/flash/src/main/java/dev/relism/extension/RouteDefinition.java b/flash/src/main/java/dev/relism/flash/extension/RouteDefinition.java
similarity index 88%
rename from flash/src/main/java/dev/relism/extension/RouteDefinition.java
rename to flash/src/main/java/dev/relism/flash/extension/RouteDefinition.java
index 8306de9..90db000 100644
--- a/flash/src/main/java/dev/relism/extension/RouteDefinition.java
+++ b/flash/src/main/java/dev/relism/flash/extension/RouteDefinition.java
@@ -1,8 +1,8 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.RequestHandler;
-import dev.relism.routing.Middleware;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.routing.Middleware;
import java.util.List;
diff --git a/flash/src/main/java/dev/relism/extension/RouteEvent.java b/flash/src/main/java/dev/relism/flash/extension/RouteEvent.java
similarity index 94%
rename from flash/src/main/java/dev/relism/extension/RouteEvent.java
rename to flash/src/main/java/dev/relism/flash/extension/RouteEvent.java
index 721467b..bde27c1 100644
--- a/flash/src/main/java/dev/relism/extension/RouteEvent.java
+++ b/flash/src/main/java/dev/relism/flash/extension/RouteEvent.java
@@ -1,7 +1,7 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
-import dev.relism.http.HttpMethod;
-import dev.relism.routing.Middleware;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.routing.Middleware;
import java.util.List;
diff --git a/flash/src/main/java/dev/relism/extension/RouteListener.java b/flash/src/main/java/dev/relism/flash/extension/RouteListener.java
similarity index 95%
rename from flash/src/main/java/dev/relism/extension/RouteListener.java
rename to flash/src/main/java/dev/relism/flash/extension/RouteListener.java
index f655e2e..9262f73 100644
--- a/flash/src/main/java/dev/relism/extension/RouteListener.java
+++ b/flash/src/main/java/dev/relism/flash/extension/RouteListener.java
@@ -1,4 +1,4 @@
-package dev.relism.extension;
+package dev.relism.flash.extension;
/**
* Observer notified once for each route registered on a {@link FlashApp} or {@link FlashScope}.
diff --git a/flash/src/main/java/dev/relism/http/ContentType.java b/flash/src/main/java/dev/relism/flash/http/ContentType.java
similarity index 98%
rename from flash/src/main/java/dev/relism/http/ContentType.java
rename to flash/src/main/java/dev/relism/flash/http/ContentType.java
index 6768ec0..e95079b 100644
--- a/flash/src/main/java/dev/relism/http/ContentType.java
+++ b/flash/src/main/java/dev/relism/flash/http/ContentType.java
@@ -1,4 +1,4 @@
-package dev.relism.http;
+package dev.relism.flash.http;
import lombok.Getter;
diff --git a/flash/src/main/java/dev/relism/http/HttpMethod.java b/flash/src/main/java/dev/relism/flash/http/HttpMethod.java
similarity index 98%
rename from flash/src/main/java/dev/relism/http/HttpMethod.java
rename to flash/src/main/java/dev/relism/flash/http/HttpMethod.java
index 473987a..39abfe5 100644
--- a/flash/src/main/java/dev/relism/http/HttpMethod.java
+++ b/flash/src/main/java/dev/relism/flash/http/HttpMethod.java
@@ -1,4 +1,4 @@
-package dev.relism.http;
+package dev.relism.flash.http;
import lombok.Getter;
import java.nio.charset.StandardCharsets;
diff --git a/flash/src/main/java/dev/relism/http/HttpStatus.java b/flash/src/main/java/dev/relism/flash/http/HttpStatus.java
similarity index 99%
rename from flash/src/main/java/dev/relism/http/HttpStatus.java
rename to flash/src/main/java/dev/relism/flash/http/HttpStatus.java
index b9e4d1f..df260e3 100644
--- a/flash/src/main/java/dev/relism/http/HttpStatus.java
+++ b/flash/src/main/java/dev/relism/flash/http/HttpStatus.java
@@ -1,4 +1,4 @@
-package dev.relism.http;
+package dev.relism.flash.http;
import java.nio.charset.StandardCharsets;
diff --git a/flash/src/main/java/dev/relism/models/HeaderMap.java b/flash/src/main/java/dev/relism/flash/models/HeaderMap.java
similarity index 99%
rename from flash/src/main/java/dev/relism/models/HeaderMap.java
rename to flash/src/main/java/dev/relism/flash/models/HeaderMap.java
index e530631..c241eb2 100644
--- a/flash/src/main/java/dev/relism/models/HeaderMap.java
+++ b/flash/src/main/java/dev/relism/flash/models/HeaderMap.java
@@ -1,4 +1,4 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import dev.relism.fpr.core.ByteView;
import lombok.NoArgsConstructor;
diff --git a/flash/src/main/java/dev/relism/models/PathParams.java b/flash/src/main/java/dev/relism/flash/models/PathParams.java
similarity index 91%
rename from flash/src/main/java/dev/relism/models/PathParams.java
rename to flash/src/main/java/dev/relism/flash/models/PathParams.java
index c9989c2..a97c156 100644
--- a/flash/src/main/java/dev/relism/models/PathParams.java
+++ b/flash/src/main/java/dev/relism/flash/models/PathParams.java
@@ -1,5 +1,6 @@
-package dev.relism.models;
+package dev.relism.flash.models;
+import dev.relism.flash.routing.AbstractRouter;
import dev.relism.fpr.core.ByteView;
import java.nio.charset.StandardCharsets;
@@ -23,7 +24,7 @@ public class PathParams {
/**
* Injects path parameters into a request. The cross-package bridge from
- * {@link dev.relism.routing.AbstractRouter} — keeps {@link Request#setPathParams}
+ * {@link AbstractRouter} — keeps {@link Request#setPathParams}
* package-private while allowing the router to set params without a public setter.
*/
public static void inject(Request request, PathParams params) {
diff --git a/flash/src/main/java/dev/relism/models/QueryParams.java b/flash/src/main/java/dev/relism/flash/models/QueryParams.java
similarity index 99%
rename from flash/src/main/java/dev/relism/models/QueryParams.java
rename to flash/src/main/java/dev/relism/flash/models/QueryParams.java
index 4e28996..d9c6a9f 100644
--- a/flash/src/main/java/dev/relism/models/QueryParams.java
+++ b/flash/src/main/java/dev/relism/flash/models/QueryParams.java
@@ -1,4 +1,4 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import dev.relism.fpr.core.ByteView;
diff --git a/flash/src/main/java/dev/relism/models/Request.java b/flash/src/main/java/dev/relism/flash/models/Request.java
similarity index 98%
rename from flash/src/main/java/dev/relism/models/Request.java
rename to flash/src/main/java/dev/relism/flash/models/Request.java
index 004b75c..bbbf8e1 100644
--- a/flash/src/main/java/dev/relism/models/Request.java
+++ b/flash/src/main/java/dev/relism/flash/models/Request.java
@@ -1,7 +1,8 @@
-package dev.relism.models;
+package dev.relism.flash.models;
+import dev.relism.flash.RequestParser;
import dev.relism.fpr.core.ByteView;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.ToString;
@@ -14,7 +15,7 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
/**
- * Immutable view of an incoming HTTP/1.1 request. Constructed by {@link dev.relism.RequestParser}
+ * Immutable view of an incoming HTTP/1.1 request. Constructed by {@link RequestParser}
* and passed directly to route handlers; never modified after creation (path/query params are
* injected once by the router before the handler runs).
*
diff --git a/flash/src/main/java/dev/relism/models/RequestBody.java b/flash/src/main/java/dev/relism/flash/models/RequestBody.java
similarity index 99%
rename from flash/src/main/java/dev/relism/models/RequestBody.java
rename to flash/src/main/java/dev/relism/flash/models/RequestBody.java
index 8f913a1..371a41b 100644
--- a/flash/src/main/java/dev/relism/models/RequestBody.java
+++ b/flash/src/main/java/dev/relism/flash/models/RequestBody.java
@@ -1,4 +1,4 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import java.io.*;
diff --git a/flash/src/main/java/dev/relism/models/RequestHandler.java b/flash/src/main/java/dev/relism/flash/models/RequestHandler.java
similarity index 92%
rename from flash/src/main/java/dev/relism/models/RequestHandler.java
rename to flash/src/main/java/dev/relism/flash/models/RequestHandler.java
index 6572a34..d8ae5bf 100644
--- a/flash/src/main/java/dev/relism/models/RequestHandler.java
+++ b/flash/src/main/java/dev/relism/flash/models/RequestHandler.java
@@ -1,14 +1,16 @@
-package dev.relism.models;
+package dev.relism.flash.models;
-import dev.relism.extension.FlashContext;
+import dev.relism.flash.extension.FlashApp;
+import dev.relism.flash.extension.FlashContext;
+import dev.relism.flash.routing.Route;
import java.util.Optional;
/**
* Base class for class-based route handlers.
*
- *
Declare the route with {@link dev.relism.routing.Route @Route} or a shorthand such as
- * {@code @GET("/path")}, then register via {@link dev.relism.extension.FlashApp#scan}.
+ *
Declare the route with {@link Route @Route} or a shorthand such as
+ * {@code @GET("/path")}, then register via {@link FlashApp#scan}.
* For ad-hoc routes use the fluent API ({@code app.get(path, handler)} or with middleware).
*
*
Lifecycle
@@ -47,7 +49,7 @@ public abstract class RequestHandler {
* Injects the {@link FlashContext} and triggers {@link #onInit()}.
*
* Infrastructure method — do not call from user code.
- * Use {@link dev.relism.extension.FlashApp#scan} instead.
+ * Use {@link FlashApp#scan} instead.
*/
public final void bind(FlashContext ctx) {
this.ctx = ctx;
diff --git a/flash/src/main/java/dev/relism/models/RequestHelper.java b/flash/src/main/java/dev/relism/flash/models/RequestHelper.java
similarity index 97%
rename from flash/src/main/java/dev/relism/models/RequestHelper.java
rename to flash/src/main/java/dev/relism/flash/models/RequestHelper.java
index 0e71541..85a2aed 100644
--- a/flash/src/main/java/dev/relism/models/RequestHelper.java
+++ b/flash/src/main/java/dev/relism/flash/models/RequestHelper.java
@@ -1,6 +1,6 @@
-package dev.relism.models;
+package dev.relism.flash.models;
-import dev.relism.exceptions.HttpException;
+import dev.relism.flash.exceptions.HttpException;
/**
* Typed accessors for request parameters. All methods throw
diff --git a/flash/src/main/java/dev/relism/models/RequestLine.java b/flash/src/main/java/dev/relism/flash/models/RequestLine.java
similarity index 82%
rename from flash/src/main/java/dev/relism/models/RequestLine.java
rename to flash/src/main/java/dev/relism/flash/models/RequestLine.java
index 93cf4f9..92e367e 100644
--- a/flash/src/main/java/dev/relism/models/RequestLine.java
+++ b/flash/src/main/java/dev/relism/flash/models/RequestLine.java
@@ -1,7 +1,7 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import dev.relism.fpr.core.ByteView;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import lombok.ToString;
import lombok.Value;
diff --git a/flash/src/main/java/dev/relism/models/Response.java b/flash/src/main/java/dev/relism/flash/models/Response.java
similarity index 98%
rename from flash/src/main/java/dev/relism/models/Response.java
rename to flash/src/main/java/dev/relism/flash/models/Response.java
index b494943..4a60d9c 100644
--- a/flash/src/main/java/dev/relism/models/Response.java
+++ b/flash/src/main/java/dev/relism/flash/models/Response.java
@@ -1,7 +1,7 @@
-package dev.relism.models;
+package dev.relism.flash.models;
-import dev.relism.http.ContentType;
-import dev.relism.http.HttpStatus;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.http.HttpStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
diff --git a/flash/src/main/java/dev/relism/models/SimpleHandler.java b/flash/src/main/java/dev/relism/flash/models/SimpleHandler.java
similarity index 95%
rename from flash/src/main/java/dev/relism/models/SimpleHandler.java
rename to flash/src/main/java/dev/relism/flash/models/SimpleHandler.java
index d064c1e..1ace14f 100644
--- a/flash/src/main/java/dev/relism/models/SimpleHandler.java
+++ b/flash/src/main/java/dev/relism/flash/models/SimpleHandler.java
@@ -1,4 +1,4 @@
-package dev.relism.models;
+package dev.relism.flash.models;
/**
* Delegates {@link #handle} to a {@link FunctionalHandler} so lambdas can be used without
diff --git a/flash/src/main/java/dev/relism/routing/AbstractRouter.java b/flash/src/main/java/dev/relism/flash/routing/AbstractRouter.java
similarity index 88%
rename from flash/src/main/java/dev/relism/routing/AbstractRouter.java
rename to flash/src/main/java/dev/relism/flash/routing/AbstractRouter.java
index 0029994..a54db16 100644
--- a/flash/src/main/java/dev/relism/routing/AbstractRouter.java
+++ b/flash/src/main/java/dev/relism/flash/routing/AbstractRouter.java
@@ -1,18 +1,20 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.Flash;
-import dev.relism.http.ContentType;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.extension.FlashApp;
+import dev.relism.flash.models.*;
+import dev.relism.flash.routing.routers.fastpathrouter.FastPathRouterImpl;
+import dev.relism.flash.Flash;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.http.HttpMethod;
import dev.relism.fpr.core.ByteView;
-import dev.relism.models.*;
-import dev.relism.template.ErrorPages;
+import dev.relism.flash.template.ErrorPages;
import java.nio.charset.StandardCharsets;
/**
* Base router contract. Owns error handlers and the compile-time middleware
* wrapping logic. The only concrete implementation is
- * {@link dev.relism.routing.routers.fastpathrouter.FastPathRouterImpl}.
+ * {@link FastPathRouterImpl}.
*
*
All middleware composition happens once at boot time; the hot-path sees
* only a plain {@link RequestHandler} call with zero allocation overhead.
@@ -22,10 +24,10 @@ import java.nio.charset.StandardCharsets;
*
Dev mode ({@code -Dflash.env=dev}): rich HTML pages with full stack traces.
* Prod mode (default): generic JSON — no internal detail leaked to clients.
*
- * Override via {@link dev.relism.extension.FlashApp#onNotFound} /
- * {@link dev.relism.extension.FlashApp#onException}.
+ * Override via {@link FlashApp#onNotFound} /
+ * {@link FlashApp#onException}.
*
- * Registration: use {@link dev.relism.extension.FlashApp} — the single
+ *
Registration: use {@link FlashApp} — the single
* public registration API. {@link #doRegister} is an infrastructure method.
*/
public abstract class AbstractRouter {
diff --git a/flash/src/main/java/dev/relism/routing/CONNECT.java b/flash/src/main/java/dev/relism/flash/routing/CONNECT.java
similarity index 84%
rename from flash/src/main/java/dev/relism/routing/CONNECT.java
rename to flash/src/main/java/dev/relism/flash/routing/CONNECT.java
index 26ca9af..a0ee8a7 100644
--- a/flash/src/main/java/dev/relism/routing/CONNECT.java
+++ b/flash/src/main/java/dev/relism/flash/routing/CONNECT.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/DELETE.java b/flash/src/main/java/dev/relism/flash/routing/DELETE.java
similarity index 84%
rename from flash/src/main/java/dev/relism/routing/DELETE.java
rename to flash/src/main/java/dev/relism/flash/routing/DELETE.java
index fa7e2ef..6fcd1e9 100644
--- a/flash/src/main/java/dev/relism/routing/DELETE.java
+++ b/flash/src/main/java/dev/relism/flash/routing/DELETE.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/GET.java b/flash/src/main/java/dev/relism/flash/routing/GET.java
similarity index 83%
rename from flash/src/main/java/dev/relism/routing/GET.java
rename to flash/src/main/java/dev/relism/flash/routing/GET.java
index 0131b33..e2b1870 100644
--- a/flash/src/main/java/dev/relism/routing/GET.java
+++ b/flash/src/main/java/dev/relism/flash/routing/GET.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/HEAD.java b/flash/src/main/java/dev/relism/flash/routing/HEAD.java
similarity index 84%
rename from flash/src/main/java/dev/relism/routing/HEAD.java
rename to flash/src/main/java/dev/relism/flash/routing/HEAD.java
index 9aeab1a..576e40e 100644
--- a/flash/src/main/java/dev/relism/routing/HEAD.java
+++ b/flash/src/main/java/dev/relism/flash/routing/HEAD.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/Middleware.java b/flash/src/main/java/dev/relism/flash/routing/Middleware.java
similarity index 89%
rename from flash/src/main/java/dev/relism/routing/Middleware.java
rename to flash/src/main/java/dev/relism/flash/routing/Middleware.java
index fadc11d..9b25110 100644
--- a/flash/src/main/java/dev/relism/routing/Middleware.java
+++ b/flash/src/main/java/dev/relism/flash/routing/Middleware.java
@@ -1,7 +1,9 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.SimpleHandler;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.SimpleHandler;
/**
* Stateless interceptor applied around a {@link RequestHandler}.
@@ -10,8 +12,8 @@ import dev.relism.models.SimpleHandler;
* chain inside the router's state machine. There is zero runtime overhead: no lists are visited,
* no lookups performed, and no objects allocated on the request hot-path.
*
- *
Middleware is intentionally stateless — it can read {@link dev.relism.models.Request},
- * write to {@link dev.relism.models.Response}, and decide whether to call {@code next} or
+ *
Middleware is intentionally stateless — it can read {@link Request},
+ * write to {@link Response}, and decide whether to call {@code next} or
* short-circuit. Shared state between layers belongs in HDI handler chains, not here.
*
*
{@code
diff --git a/flash/src/main/java/dev/relism/routing/OPTIONS.java b/flash/src/main/java/dev/relism/flash/routing/OPTIONS.java
similarity index 84%
rename from flash/src/main/java/dev/relism/routing/OPTIONS.java
rename to flash/src/main/java/dev/relism/flash/routing/OPTIONS.java
index 7417c77..752e7a3 100644
--- a/flash/src/main/java/dev/relism/routing/OPTIONS.java
+++ b/flash/src/main/java/dev/relism/flash/routing/OPTIONS.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/PATCH.java b/flash/src/main/java/dev/relism/flash/routing/PATCH.java
similarity index 84%
rename from flash/src/main/java/dev/relism/routing/PATCH.java
rename to flash/src/main/java/dev/relism/flash/routing/PATCH.java
index 259708e..63aad71 100644
--- a/flash/src/main/java/dev/relism/routing/PATCH.java
+++ b/flash/src/main/java/dev/relism/flash/routing/PATCH.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/POST.java b/flash/src/main/java/dev/relism/flash/routing/POST.java
similarity index 84%
rename from flash/src/main/java/dev/relism/routing/POST.java
rename to flash/src/main/java/dev/relism/flash/routing/POST.java
index 303495d..886e6bd 100644
--- a/flash/src/main/java/dev/relism/routing/POST.java
+++ b/flash/src/main/java/dev/relism/flash/routing/POST.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/PURGE.java b/flash/src/main/java/dev/relism/flash/routing/PURGE.java
similarity index 84%
rename from flash/src/main/java/dev/relism/routing/PURGE.java
rename to flash/src/main/java/dev/relism/flash/routing/PURGE.java
index 08a30c6..847c442 100644
--- a/flash/src/main/java/dev/relism/routing/PURGE.java
+++ b/flash/src/main/java/dev/relism/flash/routing/PURGE.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/PUT.java b/flash/src/main/java/dev/relism/flash/routing/PUT.java
similarity index 83%
rename from flash/src/main/java/dev/relism/routing/PUT.java
rename to flash/src/main/java/dev/relism/flash/routing/PUT.java
index 007c8f9..9c7eefe 100644
--- a/flash/src/main/java/dev/relism/routing/PUT.java
+++ b/flash/src/main/java/dev/relism/flash/routing/PUT.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/PathUtils.java b/flash/src/main/java/dev/relism/flash/routing/PathUtils.java
similarity index 97%
rename from flash/src/main/java/dev/relism/routing/PathUtils.java
rename to flash/src/main/java/dev/relism/flash/routing/PathUtils.java
index 7968c02..a972b49 100644
--- a/flash/src/main/java/dev/relism/routing/PathUtils.java
+++ b/flash/src/main/java/dev/relism/flash/routing/PathUtils.java
@@ -1,4 +1,4 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
public class PathUtils {
/**
diff --git a/flash/src/main/java/dev/relism/routing/Route.java b/flash/src/main/java/dev/relism/flash/routing/Route.java
similarity index 79%
rename from flash/src/main/java/dev/relism/routing/Route.java
rename to flash/src/main/java/dev/relism/flash/routing/Route.java
index abbe730..a290956 100644
--- a/flash/src/main/java/dev/relism/routing/Route.java
+++ b/flash/src/main/java/dev/relism/flash/routing/Route.java
@@ -1,6 +1,7 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -8,7 +9,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * HTTP method and path for a class-based {@link dev.relism.models.RequestHandler}.
+ * HTTP method and path for a class-based {@link RequestHandler}.
* Path is relative to the mount namespace (e.g. {@code path = "/profile"} under {@code /api}
* → {@code /api/profile}).
*
diff --git a/flash/src/main/java/dev/relism/routing/Routes.java b/flash/src/main/java/dev/relism/flash/routing/Routes.java
similarity index 94%
rename from flash/src/main/java/dev/relism/routing/Routes.java
rename to flash/src/main/java/dev/relism/flash/routing/Routes.java
index 117b06e..1b84d81 100644
--- a/flash/src/main/java/dev/relism/routing/Routes.java
+++ b/flash/src/main/java/dev/relism/flash/routing/Routes.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.Annotation;
diff --git a/flash/src/main/java/dev/relism/routing/TRACE.java b/flash/src/main/java/dev/relism/flash/routing/TRACE.java
similarity index 84%
rename from flash/src/main/java/dev/relism/routing/TRACE.java
rename to flash/src/main/java/dev/relism/flash/routing/TRACE.java
index dedabf8..a50e683 100644
--- a/flash/src/main/java/dev/relism/routing/TRACE.java
+++ b/flash/src/main/java/dev/relism/flash/routing/TRACE.java
@@ -1,6 +1,6 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flash/src/main/java/dev/relism/routing/routers/fastpathrouter/FastPathRouterImpl.java b/flash/src/main/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathRouterImpl.java
similarity index 93%
rename from flash/src/main/java/dev/relism/routing/routers/fastpathrouter/FastPathRouterImpl.java
rename to flash/src/main/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathRouterImpl.java
index 00910c7..7697a9e 100644
--- a/flash/src/main/java/dev/relism/routing/routers/fastpathrouter/FastPathRouterImpl.java
+++ b/flash/src/main/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathRouterImpl.java
@@ -1,14 +1,14 @@
-package dev.relism.routing.routers.fastpathrouter;
+package dev.relism.flash.routing.routers.fastpathrouter;
import dev.relism.fpr.core.ByteView;
import dev.relism.fpr.core.FastPathRouter;
import dev.relism.fpr.core.MatchResult;
import dev.relism.fpr.core.RouterBuilder;
import dev.relism.fpr.core.dsl.StringRouteParser;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
-import dev.relism.routing.AbstractRouter;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.routing.AbstractRouter;
/**
* Router backed by the {@code fpr-core} byte-level state machine. Routes are compiled lazily
diff --git a/flash/src/main/java/dev/relism/routing/routers/fastpathrouter/FastPathViews.java b/flash/src/main/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathViews.java
similarity index 97%
rename from flash/src/main/java/dev/relism/routing/routers/fastpathrouter/FastPathViews.java
rename to flash/src/main/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathViews.java
index 47b1c4e..2473c87 100644
--- a/flash/src/main/java/dev/relism/routing/routers/fastpathrouter/FastPathViews.java
+++ b/flash/src/main/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathViews.java
@@ -1,4 +1,4 @@
-package dev.relism.routing.routers.fastpathrouter;
+package dev.relism.flash.routing.routers.fastpathrouter;
import dev.relism.fpr.core.ByteView;
import lombok.NoArgsConstructor;
diff --git a/flash/src/main/java/dev/relism/flash/routing/routers/radix/RadixPathRouterImpl.java b/flash/src/main/java/dev/relism/flash/routing/routers/radix/RadixPathRouterImpl.java
new file mode 100644
index 0000000..573fb66
--- /dev/null
+++ b/flash/src/main/java/dev/relism/flash/routing/routers/radix/RadixPathRouterImpl.java
@@ -0,0 +1,5 @@
+package dev.relism.flash.routing.routers.radix;
+
+public class RadixPathRouterImpl {
+
+}
diff --git a/flash/src/main/java/dev/relism/template/ByteTemplate.java b/flash/src/main/java/dev/relism/flash/template/ByteTemplate.java
similarity index 98%
rename from flash/src/main/java/dev/relism/template/ByteTemplate.java
rename to flash/src/main/java/dev/relism/flash/template/ByteTemplate.java
index 1d77b46..1fff0ff 100644
--- a/flash/src/main/java/dev/relism/template/ByteTemplate.java
+++ b/flash/src/main/java/dev/relism/flash/template/ByteTemplate.java
@@ -1,4 +1,4 @@
-package dev.relism.template;
+package dev.relism.flash.template;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
diff --git a/flash/src/main/java/dev/relism/template/ErrorPages.java b/flash/src/main/java/dev/relism/flash/template/ErrorPages.java
similarity index 95%
rename from flash/src/main/java/dev/relism/template/ErrorPages.java
rename to flash/src/main/java/dev/relism/flash/template/ErrorPages.java
index 62c158a..b838b3a 100644
--- a/flash/src/main/java/dev/relism/template/ErrorPages.java
+++ b/flash/src/main/java/dev/relism/flash/template/ErrorPages.java
@@ -1,8 +1,8 @@
-package dev.relism.template;
+package dev.relism.flash.template;
-import dev.relism.Flash;
-import dev.relism.models.Request;
-import dev.relism.models.RequestLine;
+import dev.relism.flash.Flash;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestLine;
import lombok.NoArgsConstructor;
import java.io.IOException;
diff --git a/flash/src/main/java/dev/relism/routing/routers/radix/RadixPathRouterImpl.java b/flash/src/main/java/dev/relism/routing/routers/radix/RadixPathRouterImpl.java
deleted file mode 100644
index da29a87..0000000
--- a/flash/src/main/java/dev/relism/routing/routers/radix/RadixPathRouterImpl.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package dev.relism.routing.routers.radix;
-
-public class RadixPathRouterImpl {
-
-}
diff --git a/flash/src/test/java/dev/relism/ChunkedInputStreamTest.java b/flash/src/test/java/dev/relism/flash/ChunkedInputStreamTest.java
similarity index 99%
rename from flash/src/test/java/dev/relism/ChunkedInputStreamTest.java
rename to flash/src/test/java/dev/relism/flash/ChunkedInputStreamTest.java
index 9b11fa2..632e4ae 100644
--- a/flash/src/test/java/dev/relism/ChunkedInputStreamTest.java
+++ b/flash/src/test/java/dev/relism/flash/ChunkedInputStreamTest.java
@@ -1,4 +1,4 @@
-package dev.relism;
+package dev.relism.flash;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/HttpServerConcurrencyTest.java b/flash/src/test/java/dev/relism/flash/HttpServerConcurrencyTest.java
similarity index 97%
rename from flash/src/test/java/dev/relism/HttpServerConcurrencyTest.java
rename to flash/src/test/java/dev/relism/flash/HttpServerConcurrencyTest.java
index f121037..ea4368e 100644
--- a/flash/src/test/java/dev/relism/HttpServerConcurrencyTest.java
+++ b/flash/src/test/java/dev/relism/flash/HttpServerConcurrencyTest.java
@@ -1,9 +1,9 @@
-package dev.relism;
+package dev.relism.flash;
-import dev.relism.extension.FlashApp;
-import dev.relism.extension.FlashConfiguration;
-import dev.relism.http.ContentType;
-import dev.relism.models.Response;
+import dev.relism.flash.extension.FlashApp;
+import dev.relism.flash.extension.FlashConfiguration;
+import dev.relism.flash.http.ContentType;
+import dev.relism.flash.models.Response;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/HttpServerTest.java b/flash/src/test/java/dev/relism/flash/HttpServerTest.java
similarity index 97%
rename from flash/src/test/java/dev/relism/HttpServerTest.java
rename to flash/src/test/java/dev/relism/flash/HttpServerTest.java
index 4e1e7b4..1d32d6e 100644
--- a/flash/src/test/java/dev/relism/HttpServerTest.java
+++ b/flash/src/test/java/dev/relism/flash/HttpServerTest.java
@@ -1,9 +1,7 @@
-package dev.relism;
+package dev.relism.flash;
-import dev.relism.extension.FlashApp;
-import dev.relism.extension.FlashConfiguration;
-import dev.relism.http.ContentType;
-import dev.relism.models.Response;
+import dev.relism.flash.extension.FlashApp;
+import dev.relism.flash.extension.FlashConfiguration;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -15,7 +13,6 @@ import java.io.OutputStream;
import java.net.ServerSocket;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
-import java.util.concurrent.TimeUnit;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/flash/src/test/java/dev/relism/RequestParserTest.java b/flash/src/test/java/dev/relism/flash/RequestParserTest.java
similarity index 98%
rename from flash/src/test/java/dev/relism/RequestParserTest.java
rename to flash/src/test/java/dev/relism/flash/RequestParserTest.java
index 86d5c29..d2ebb9a 100644
--- a/flash/src/test/java/dev/relism/RequestParserTest.java
+++ b/flash/src/test/java/dev/relism/flash/RequestParserTest.java
@@ -1,6 +1,6 @@
-package dev.relism;
+package dev.relism.flash;
-import dev.relism.models.Request;
+import dev.relism.flash.models.Request;
import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream;
diff --git a/flash/src/test/java/dev/relism/api/multipart/MultipartTest.java b/flash/src/test/java/dev/relism/flash/api/multipart/MultipartTest.java
similarity index 97%
rename from flash/src/test/java/dev/relism/api/multipart/MultipartTest.java
rename to flash/src/test/java/dev/relism/flash/api/multipart/MultipartTest.java
index 29a09fc..475267e 100644
--- a/flash/src/test/java/dev/relism/api/multipart/MultipartTest.java
+++ b/flash/src/test/java/dev/relism/flash/api/multipart/MultipartTest.java
@@ -1,10 +1,10 @@
-package dev.relism.api.multipart;
+package dev.relism.flash.api.multipart;
import dev.relism.fpr.core.ByteView;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.HeaderMap;
-import dev.relism.models.Request;
-import dev.relism.models.RequestLine;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.HeaderMap;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestLine;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/flash/src/test/java/dev/relism/http/ContentTypeTest.java b/flash/src/test/java/dev/relism/flash/http/ContentTypeTest.java
similarity index 96%
rename from flash/src/test/java/dev/relism/http/ContentTypeTest.java
rename to flash/src/test/java/dev/relism/flash/http/ContentTypeTest.java
index 495dff9..e835969 100644
--- a/flash/src/test/java/dev/relism/http/ContentTypeTest.java
+++ b/flash/src/test/java/dev/relism/flash/http/ContentTypeTest.java
@@ -1,4 +1,4 @@
-package dev.relism.http;
+package dev.relism.flash.http;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/http/HttpMethodTest.java b/flash/src/test/java/dev/relism/flash/http/HttpMethodTest.java
similarity index 98%
rename from flash/src/test/java/dev/relism/http/HttpMethodTest.java
rename to flash/src/test/java/dev/relism/flash/http/HttpMethodTest.java
index c65b891..70dc6f6 100644
--- a/flash/src/test/java/dev/relism/http/HttpMethodTest.java
+++ b/flash/src/test/java/dev/relism/flash/http/HttpMethodTest.java
@@ -1,4 +1,4 @@
-package dev.relism.http;
+package dev.relism.flash.http;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/http/HttpStatusTest.java b/flash/src/test/java/dev/relism/flash/http/HttpStatusTest.java
similarity index 98%
rename from flash/src/test/java/dev/relism/http/HttpStatusTest.java
rename to flash/src/test/java/dev/relism/flash/http/HttpStatusTest.java
index 6f2960c..9256ce0 100644
--- a/flash/src/test/java/dev/relism/http/HttpStatusTest.java
+++ b/flash/src/test/java/dev/relism/flash/http/HttpStatusTest.java
@@ -1,4 +1,4 @@
-package dev.relism.http;
+package dev.relism.flash.http;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/models/HeaderMapTest.java b/flash/src/test/java/dev/relism/flash/models/HeaderMapTest.java
similarity index 98%
rename from flash/src/test/java/dev/relism/models/HeaderMapTest.java
rename to flash/src/test/java/dev/relism/flash/models/HeaderMapTest.java
index 6157d21..dc9d14b 100644
--- a/flash/src/test/java/dev/relism/models/HeaderMapTest.java
+++ b/flash/src/test/java/dev/relism/flash/models/HeaderMapTest.java
@@ -1,4 +1,4 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import dev.relism.fpr.core.ByteView;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/models/PathParamsTest.java b/flash/src/test/java/dev/relism/flash/models/PathParamsTest.java
similarity index 98%
rename from flash/src/test/java/dev/relism/models/PathParamsTest.java
rename to flash/src/test/java/dev/relism/flash/models/PathParamsTest.java
index f316473..f6299eb 100644
--- a/flash/src/test/java/dev/relism/models/PathParamsTest.java
+++ b/flash/src/test/java/dev/relism/flash/models/PathParamsTest.java
@@ -1,4 +1,4 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import dev.relism.fpr.core.ByteView;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/models/QueryParamsTest.java b/flash/src/test/java/dev/relism/flash/models/QueryParamsTest.java
similarity index 98%
rename from flash/src/test/java/dev/relism/models/QueryParamsTest.java
rename to flash/src/test/java/dev/relism/flash/models/QueryParamsTest.java
index 027dd92..c9a2b6d 100644
--- a/flash/src/test/java/dev/relism/models/QueryParamsTest.java
+++ b/flash/src/test/java/dev/relism/flash/models/QueryParamsTest.java
@@ -1,4 +1,4 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import dev.relism.fpr.core.ByteView;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/models/RequestBodyTest.java b/flash/src/test/java/dev/relism/flash/models/RequestBodyTest.java
similarity index 99%
rename from flash/src/test/java/dev/relism/models/RequestBodyTest.java
rename to flash/src/test/java/dev/relism/flash/models/RequestBodyTest.java
index 4c61aad..ea7f2b4 100644
--- a/flash/src/test/java/dev/relism/models/RequestBodyTest.java
+++ b/flash/src/test/java/dev/relism/flash/models/RequestBodyTest.java
@@ -1,4 +1,4 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/models/RequestLineTest.java b/flash/src/test/java/dev/relism/flash/models/RequestLineTest.java
similarity index 94%
rename from flash/src/test/java/dev/relism/models/RequestLineTest.java
rename to flash/src/test/java/dev/relism/flash/models/RequestLineTest.java
index 9599b1b..bccb764 100644
--- a/flash/src/test/java/dev/relism/models/RequestLineTest.java
+++ b/flash/src/test/java/dev/relism/flash/models/RequestLineTest.java
@@ -1,7 +1,7 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import dev.relism.fpr.core.ByteView;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import org.junit.jupiter.api.Test;
import java.nio.charset.StandardCharsets;
diff --git a/flash/src/test/java/dev/relism/models/RequestTest.java b/flash/src/test/java/dev/relism/flash/models/RequestTest.java
similarity index 97%
rename from flash/src/test/java/dev/relism/models/RequestTest.java
rename to flash/src/test/java/dev/relism/flash/models/RequestTest.java
index b961021..908079e 100644
--- a/flash/src/test/java/dev/relism/models/RequestTest.java
+++ b/flash/src/test/java/dev/relism/flash/models/RequestTest.java
@@ -1,7 +1,7 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import dev.relism.fpr.core.ByteView;
-import dev.relism.http.HttpMethod;
+import dev.relism.flash.http.HttpMethod;
import org.junit.jupiter.api.Test;
import java.nio.charset.StandardCharsets;
diff --git a/flash/src/test/java/dev/relism/models/ResponseTest.java b/flash/src/test/java/dev/relism/flash/models/ResponseTest.java
similarity index 98%
rename from flash/src/test/java/dev/relism/models/ResponseTest.java
rename to flash/src/test/java/dev/relism/flash/models/ResponseTest.java
index 0b14648..33ffb73 100644
--- a/flash/src/test/java/dev/relism/models/ResponseTest.java
+++ b/flash/src/test/java/dev/relism/flash/models/ResponseTest.java
@@ -1,6 +1,6 @@
-package dev.relism.models;
+package dev.relism.flash.models;
-import dev.relism.http.ContentType;
+import dev.relism.flash.http.ContentType;
import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream;
diff --git a/flash/src/test/java/dev/relism/models/SimpleHandlerTest.java b/flash/src/test/java/dev/relism/flash/models/SimpleHandlerTest.java
similarity index 93%
rename from flash/src/test/java/dev/relism/models/SimpleHandlerTest.java
rename to flash/src/test/java/dev/relism/flash/models/SimpleHandlerTest.java
index 84dede8..e4bec7a 100644
--- a/flash/src/test/java/dev/relism/models/SimpleHandlerTest.java
+++ b/flash/src/test/java/dev/relism/flash/models/SimpleHandlerTest.java
@@ -1,4 +1,4 @@
-package dev.relism.models;
+package dev.relism.flash.models;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/routing/AbstractRouterTest.java b/flash/src/test/java/dev/relism/flash/routing/AbstractRouterTest.java
similarity index 91%
rename from flash/src/test/java/dev/relism/routing/AbstractRouterTest.java
rename to flash/src/test/java/dev/relism/flash/routing/AbstractRouterTest.java
index ffdaccc..2acbfba 100644
--- a/flash/src/test/java/dev/relism/routing/AbstractRouterTest.java
+++ b/flash/src/test/java/dev/relism/flash/routing/AbstractRouterTest.java
@@ -1,10 +1,10 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.Response;
-import dev.relism.models.SimpleHandler;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.Response;
+import dev.relism.flash.models.SimpleHandler;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/flash/src/test/java/dev/relism/routing/PathUtilsTest.java b/flash/src/test/java/dev/relism/flash/routing/PathUtilsTest.java
similarity index 98%
rename from flash/src/test/java/dev/relism/routing/PathUtilsTest.java
rename to flash/src/test/java/dev/relism/flash/routing/PathUtilsTest.java
index a4fd52e..19fad47 100644
--- a/flash/src/test/java/dev/relism/routing/PathUtilsTest.java
+++ b/flash/src/test/java/dev/relism/flash/routing/PathUtilsTest.java
@@ -1,4 +1,4 @@
-package dev.relism.routing;
+package dev.relism.flash.routing;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/routing/routers/fastpathrouter/FastPathRouterImplTest.java b/flash/src/test/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathRouterImplTest.java
similarity index 86%
rename from flash/src/test/java/dev/relism/routing/routers/fastpathrouter/FastPathRouterImplTest.java
rename to flash/src/test/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathRouterImplTest.java
index dafb126..5c97c17 100644
--- a/flash/src/test/java/dev/relism/routing/routers/fastpathrouter/FastPathRouterImplTest.java
+++ b/flash/src/test/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathRouterImplTest.java
@@ -1,12 +1,12 @@
-package dev.relism.routing.routers.fastpathrouter;
+package dev.relism.flash.routing.routers.fastpathrouter;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.HeaderMap;
-import dev.relism.models.Request;
-import dev.relism.models.RequestHandler;
-import dev.relism.models.RequestLine;
-import dev.relism.models.SimpleHandler;
-import dev.relism.routing.Middleware;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.HeaderMap;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestHandler;
+import dev.relism.flash.models.RequestLine;
+import dev.relism.flash.models.SimpleHandler;
+import dev.relism.flash.routing.Middleware;
import org.junit.jupiter.api.Test;
import java.nio.charset.StandardCharsets;
diff --git a/flash/src/test/java/dev/relism/routing/routers/fastpathrouter/FastPathViewsTest.java b/flash/src/test/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathViewsTest.java
similarity index 97%
rename from flash/src/test/java/dev/relism/routing/routers/fastpathrouter/FastPathViewsTest.java
rename to flash/src/test/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathViewsTest.java
index 1c04683..f8b7093 100644
--- a/flash/src/test/java/dev/relism/routing/routers/fastpathrouter/FastPathViewsTest.java
+++ b/flash/src/test/java/dev/relism/flash/routing/routers/fastpathrouter/FastPathViewsTest.java
@@ -1,4 +1,4 @@
-package dev.relism.routing.routers.fastpathrouter;
+package dev.relism.flash.routing.routers.fastpathrouter;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/template/ByteTemplateTest.java b/flash/src/test/java/dev/relism/flash/template/ByteTemplateTest.java
similarity index 98%
rename from flash/src/test/java/dev/relism/template/ByteTemplateTest.java
rename to flash/src/test/java/dev/relism/flash/template/ByteTemplateTest.java
index 12cbcfa..1fb3070 100644
--- a/flash/src/test/java/dev/relism/template/ByteTemplateTest.java
+++ b/flash/src/test/java/dev/relism/flash/template/ByteTemplateTest.java
@@ -1,4 +1,4 @@
-package dev.relism.template;
+package dev.relism.flash.template;
import org.junit.jupiter.api.Test;
diff --git a/flash/src/test/java/dev/relism/template/ErrorPagesTest.java b/flash/src/test/java/dev/relism/flash/template/ErrorPagesTest.java
similarity index 88%
rename from flash/src/test/java/dev/relism/template/ErrorPagesTest.java
rename to flash/src/test/java/dev/relism/flash/template/ErrorPagesTest.java
index bcb2a09..36f5876 100644
--- a/flash/src/test/java/dev/relism/template/ErrorPagesTest.java
+++ b/flash/src/test/java/dev/relism/flash/template/ErrorPagesTest.java
@@ -1,10 +1,10 @@
-package dev.relism.template;
+package dev.relism.flash.template;
-import dev.relism.http.HttpMethod;
-import dev.relism.models.HeaderMap;
-import dev.relism.models.Request;
-import dev.relism.models.RequestLine;
-import dev.relism.routing.routers.fastpathrouter.FastPathViews;
+import dev.relism.flash.http.HttpMethod;
+import dev.relism.flash.models.HeaderMap;
+import dev.relism.flash.models.Request;
+import dev.relism.flash.models.RequestLine;
+import dev.relism.flash.routing.routers.fastpathrouter.FastPathViews;
import org.junit.jupiter.api.Test;
import java.nio.charset.StandardCharsets;
diff --git a/pom.xml b/pom.xml
index b43f0b9..d88505a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
dev.relism
- flash-web-bundler
+ flash-ext-web-bundler
${project.version}