refactor: rename packages and files to use 'flash' prefix for consistency
This commit is contained in:
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
+2
-2
@@ -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;
|
||||
+9
-10
@@ -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<? extends Annotation> annotationType() { return Route.class; }
|
||||
};
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package dev.relism.ext.openapi;
|
||||
package dev.relism.flash.ext.openapi;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package dev.relism.ext.openapi;
|
||||
package dev.relism.flash.ext.openapi;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
+9
-8
@@ -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<? extends java.lang.annotation.Annotation> annotationType() { return Route.class; }
|
||||
};
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package dev.relism.ext.openapi;
|
||||
package dev.relism.flash.ext.openapi;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package dev.relism.ext.openapi;
|
||||
package dev.relism.flash.ext.openapi;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package dev.relism.ext.openapi;
|
||||
package dev.relism.flash.ext.openapi;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package dev.relism.ext.openapi;
|
||||
package dev.relism.flash.ext.openapi;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
+22
-19
@@ -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<UserDto> handle(dev.relism.models.Request request, dev.relism.models.Response response) {
|
||||
public List<UserDto> 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<String, UserDto> handle(dev.relism.models.Request request, dev.relism.models.Response response) {
|
||||
public Map<String, UserDto> 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;
|
||||
}
|
||||
}
|
||||
+14
-13
@@ -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();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user