Skip to content

VERTXLIB-62 Vert.x 5 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdickmeiss merged 23 commits into from
Aug 21, 2025
Merged

VERTXLIB-62 Vert.x 5 #97

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8232433
VERTXLIB-62 Vert.x 5
adamdickmeiss Aug 11, 2025
c3ed272
Further
adamdickmeiss Aug 13, 2025
d5ab112
Trying to resolve $ref
adamdickmeiss Aug 14, 2025
4651ea9
tenant-2.0.yaml validates with ref
adamdickmeiss Aug 14, 2025
a39e3e9
Passing tests
adamdickmeiss Aug 15, 2025
dacb342
openapi-deref-plugin
adamdickmeiss Aug 15, 2025
8739f5a
SQ
adamdickmeiss Aug 15, 2025
252b8c0
More testing of plugin
adamdickmeiss Aug 15, 2025
30f4d4f
package private constructor
adamdickmeiss Aug 15, 2025
109d8fa
Revert "package private constructor"
adamdickmeiss Aug 15, 2025
f7db652
private constructor
adamdickmeiss Aug 15, 2025
3ae1c6d
Unused deps
adamdickmeiss Aug 19, 2025
6af400d
vertx 5.0.3
adamdickmeiss Aug 19, 2025
791882e
Update some deps + note on swagger-parser version
adamdickmeiss Aug 20, 2025
f790b92
Upgrade to swagger-parser 2.1.32
adamdickmeiss Aug 20, 2025
6644fd8
Get JSON refs to work again
adamdickmeiss Aug 20, 2025
d89fa07
Plugin: input with glob patterns; default values
adamdickmeiss Aug 20, 2025
733662d
SQ warnings
adamdickmeiss Aug 20, 2025
af46182
Update API snippets; mention openapi-deref-plugin
adamdickmeiss Aug 20, 2025
05b111c
Next version is 4.0.0-SNAPSHOT (major)
adamdickmeiss Aug 20, 2025
d2b00d9
Change test spec, so that no $ref occur in output
adamdickmeiss Aug 21, 2025
89a8300
Fix launch of mod-example
adamdickmeiss Aug 21, 2025
42c3e77
Use okapi-common 7.0.0
adamdickmeiss Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 55 additions & 4 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web</artifactId>
Expand All @@ -22,15 +32,19 @@
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-openapi</artifactId>
<artifactId>vertx-openapi</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-rx-java2</artifactId>
<artifactId>vertx-web-openapi-router</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-validation</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-web-api-contract</artifactId>
<artifactId>vertx-rx-java2</artifactId>
</dependency>
<dependency>
<groupId>io.vertx</groupId>
Expand Down Expand Up @@ -147,8 +161,45 @@
</dependencies>

<build>
<resources>
<resource>
<directory>${project.build.directory}/generated-resources</directory>
<includes>
<include>**/*</include>
</includes>
</resource>
<!-- ...other resources... -->
</resources>
<plugins>

<plugin>
<groupId>org.folio</groupId>
<artifactId>openapi-deref-plugin</artifactId>
<version>3.5.0-SNAPSHOT</version>
<executions>
<execution>
<id>dereference-tenant</id>
<goals>
<goal>dereference</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<input>${project.basedir}/src/main/resources/openapi/tenant-2.0.yaml</input>
<output>${project.build.directory}/generated-resources/openapi/tenant-2.0.deref.yaml</output>
</configuration>
</execution>
<execution>
<id>dereference-echo</id>
<goals>
<goal>dereference</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<input>${project.basedir}/src/test/resources/openapi/echo.yaml</input>
<output>${project.build.directory}/echo.deref.yaml</output>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
9 changes: 5 additions & 4 deletions core/src/main/java/org/folio/tlib/RouterCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import io.vertx.core.Vertx;
import io.vertx.ext.web.Router;
import org.folio.okapi.common.XOkapiHeaders;
import org.folio.okapi.common.logging.FolioLocal;
import org.folio.okapi.common.logging.FolioLoggingContext;

/**
Expand Down Expand Up @@ -40,13 +41,13 @@ static Future<Router> mountAll(Vertx vertx, RouterCreator [] routerCreators, Str
Future<Void> future = Future.succeededFuture();
Router router = Router.router(vertx);
router.route().handler(ctx -> {
FolioLoggingContext.put(FolioLoggingContext.MODULE_ID_LOGGING_VAR_NAME, module);
FolioLoggingContext.put(FolioLocal.MODULE_ID, module);
MultiMap headers = ctx.request().headers();
FolioLoggingContext.put(FolioLoggingContext.TENANT_ID_LOGGING_VAR_NAME,
FolioLoggingContext.put(FolioLocal.TENANT_ID,
headers.get(XOkapiHeaders.TENANT));
FolioLoggingContext.put(FolioLoggingContext.REQUEST_ID_LOGGING_VAR_NAME,
FolioLoggingContext.put(FolioLocal.REQUEST_ID,
headers.get(XOkapiHeaders.REQUEST_ID));
FolioLoggingContext.put(FolioLoggingContext.USER_ID_LOGGING_VAR_NAME,
FolioLoggingContext.put(FolioLocal.USER_ID,
headers.get(XOkapiHeaders.USER_ID));
ctx.next();
});
Expand Down
77 changes: 39 additions & 38 deletions core/src/main/java/org/folio/tlib/api/Tenant2Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
import io.vertx.core.json.JsonObject;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.openapi.RouterBuilder;
import io.vertx.ext.web.validation.RequestParameter;
import io.vertx.ext.web.validation.RequestParameters;
import io.vertx.ext.web.validation.ValidationHandler;
import io.vertx.ext.web.openapi.router.RouterBuilder;
import io.vertx.openapi.contract.OpenAPIContract;
import io.vertx.openapi.validation.ValidatedRequest;
import io.vertx.sqlclient.Tuple;
import java.util.HashMap;
import java.util.LinkedList;
Expand All @@ -20,7 +19,6 @@
import java.util.UUID;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.folio.okapi.common.XOkapiHeaders;
import org.folio.tlib.RouterCreator;
import org.folio.tlib.TenantInitHooks;
import org.folio.tlib.postgres.impl.TenantPgPoolImpl;
Expand Down Expand Up @@ -62,8 +60,12 @@ static void failHandler(RoutingContext ctx, int code, Throwable e) {
failHandler(ctx, ctx.statusCode(),
HttpResponseStatus.valueOf(ctx.statusCode()).reasonPhrase());
} else {
log.error("{}", e.getMessage());
failHandler(ctx, code, e.getMessage());
Throwable t = e.getCause();
if (t == null) {
t = e;
}
log.error("{}", e.getMessage(), e);
failHandler(ctx, code, t.getMessage());
}
}

Expand Down Expand Up @@ -187,12 +189,13 @@ private static Future<Void> saveJob(Vertx vertx, JsonObject tenantJob) {

private void handlers(Vertx vertx, RouterBuilder routerBuilder) {
log.info("setting up tenant handlers ... begin");
routerBuilder
.operation("postTenant")
.handler(ctx -> {
RequestParameters params = ctx.get(ValidationHandler.REQUEST_CONTEXT_KEY);
log.info("postTenant handler {}", params.toJson().encode());
JsonObject tenantAttributes = ctx.body().asJsonObject();

routerBuilder.getRoute("postTenant")
.addHandler(ctx -> {
ValidatedRequest validatedRequest =
ctx.get(RouterBuilder.KEY_META_DATA_VALIDATED_REQUEST);
JsonObject tenantAttributes = validatedRequest.getBody().getJsonObject();
log.info("postTenant handler {}", tenantAttributes.encode());
String tenant = TenantUtil.tenant(ctx);

createJob(vertx, tenant, tenantAttributes)
Expand All @@ -218,17 +221,15 @@ private void handlers(Vertx vertx, RouterBuilder routerBuilder) {
failHandler(ctx, 500, e);
});
})
.failureHandler(ctx -> Tenant2Api.failHandler(ctx, 400, ctx.failure()));
routerBuilder
.operation("getTenantJob")
.handler(ctx -> {
RequestParameters params = ctx.get(ValidationHandler.REQUEST_CONTEXT_KEY);
String id = params.pathParameter("id").getString();
String tenant = params.headerParameter(XOkapiHeaders.TENANT).getString();
RequestParameter waitParameter = params.queryParameter("wait");
int wait = waitParameter != null ? waitParameter.getInteger() : 0;
log.info("getTenantJob handler id={} wait={}", id,
waitParameter != null ? waitParameter.getInteger() : "null");
.addFailureHandler(ctx -> Tenant2Api.failHandler(ctx, 400, ctx.failure()));

routerBuilder.getRoute("getTenantJob")
.addHandler(ctx -> {
String id = ctx.pathParam("id");
String tenant = TenantUtil.tenant(ctx);
List<String> waitParameter = ctx.queryParam("wait");
int wait = waitParameter.isEmpty() ? 0 : Integer.parseInt(waitParameter.get(0));
log.info("getTenantJob handler id={} wait={}", id, wait);
getJob(vertx, tenant, UUID.fromString(id), wait)
.onSuccess(res -> {
if (res == null) {
Expand All @@ -241,13 +242,12 @@ private void handlers(Vertx vertx, RouterBuilder routerBuilder) {
})
.onFailure(e -> failHandler(ctx, 500, e));
})
.failureHandler(ctx -> Tenant2Api.failHandler(ctx, 400, ctx.failure()));
routerBuilder
.operation("deleteTenantJob")
.handler(ctx -> {
RequestParameters params = ctx.get(ValidationHandler.REQUEST_CONTEXT_KEY);
String id = params.pathParameter("id").getString();
String tenant = params.headerParameter(XOkapiHeaders.TENANT).getString();
.addFailureHandler(ctx -> Tenant2Api.failHandler(ctx, 400, ctx.failure()));

routerBuilder.getRoute("deleteTenantJob")
.addHandler(ctx -> {
String id = ctx.pathParam("id");
String tenant = TenantUtil.tenant(ctx);
log.info("deleteTenantJob handler id={}", id);
deleteJob(vertx, tenant, UUID.fromString(id))
.onSuccess(res -> {
Expand All @@ -260,7 +260,8 @@ private void handlers(Vertx vertx, RouterBuilder routerBuilder) {
})
.onFailure(e -> failHandler(ctx, 500, e));
})
.failureHandler(ctx -> Tenant2Api.failHandler(ctx, 400, ctx.failure()));
.addFailureHandler(ctx -> Tenant2Api.failHandler(ctx, 400, ctx.failure()));

log.info("setting up tenant handlers ... done");
}

Expand All @@ -272,11 +273,11 @@ private void handlers(Vertx vertx, RouterBuilder routerBuilder) {
*/
@Override
public Future<Router> createRouter(Vertx vertx) {
return RouterBuilder.create(vertx, "openapi/tenant-2.0.yaml")
.map(routerBuilder -> {
handlers(vertx, routerBuilder);
return routerBuilder.createRouter();
});
return OpenAPIContract.from(vertx, "openapi/tenant-2.0.deref.yaml")
.map(contract -> {
RouterBuilder routerBuilder = RouterBuilder.create(vertx, contract);
handlers(vertx, routerBuilder);
return routerBuilder.createRouter();
});
}

}
5 changes: 2 additions & 3 deletions core/src/main/java/org/folio/tlib/postgres/TenantPgPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import io.vertx.core.Future;
import io.vertx.core.Vertx;
import io.vertx.pgclient.PgConnectOptions;
import io.vertx.pgclient.PgPool;
import io.vertx.sqlclient.Pool;
import io.vertx.sqlclient.PoolOptions;
import io.vertx.sqlclient.Row;
Expand All @@ -14,9 +13,9 @@
import org.folio.tlib.postgres.impl.TenantPgPoolImpl;

/**
* The {@link PgPool} for a tenant.
* The {@link Pool} for a tenant.
*/
public interface TenantPgPool extends PgPool {
public interface TenantPgPool extends Pool {

/**
* create tenant pool for tenant.
Expand Down
Loading