diff --git a/pom.xml b/pom.xml index 316028c..1d5ce0f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.haiti.filter haiti-filter-quarkus-reactive - 0.1.0 + 0.2.0 jar Haiti Filter Reactive Quarkus @@ -24,7 +24,7 @@ 11 2.5.1.Final - 0.1.0 + 0.2.0 1.6.8 3.2.1 diff --git a/src/main/java/dev/struchkov/haiti/filter/quarkus/CriteriaFilter.java b/src/main/java/dev/struchkov/haiti/filter/quarkus/CriteriaFilter.java index c00651b..0af0b65 100644 --- a/src/main/java/dev/struchkov/haiti/filter/quarkus/CriteriaFilter.java +++ b/src/main/java/dev/struchkov/haiti/filter/quarkus/CriteriaFilter.java @@ -4,6 +4,10 @@ import dev.struchkov.haiti.filter.Filter; import dev.struchkov.haiti.filter.FilterQuery; import dev.struchkov.haiti.filter.jooq.CriteriaJooqFilter; import dev.struchkov.haiti.filter.jooq.JoinTable; +import dev.struchkov.haiti.filter.jooq.SortContainer; +import dev.struchkov.haiti.filter.jooq.SortType; +import dev.struchkov.haiti.filter.jooq.page.PageableOffset; +import dev.struchkov.haiti.filter.jooq.page.PageableSeek; import io.smallrye.mutiny.Multi; import io.vertx.mutiny.pgclient.PgPool; import io.vertx.mutiny.sqlclient.Row; @@ -69,8 +73,13 @@ public class CriteriaFilter implements Filter { return this; } - public CriteriaFilter page(@NonNull String fieldOrder, Object id, int pageSize) { - jooqFilter.page(fieldOrder, id, pageSize); + public CriteriaFilter page(@NonNull PageableOffset offset) { + jooqFilter.page(offset); + return this; + } + + public CriteriaFilter page(@NonNull PageableSeek seek) { + jooqFilter.page(seek); return this; } @@ -79,6 +88,21 @@ public class CriteriaFilter implements Filter { return this; } + public CriteriaFilter sort(@NonNull SortContainer container) { + jooqFilter.sort(container); + return this; + } + + public CriteriaFilter sort(@NonNull String field, SortType sortType) { + jooqFilter.sort(field, sortType); + return this; + } + + public CriteriaFilter sort(@NonNull String field) { + jooqFilter.sort(field); + return this; + } + @Override public Multi build() { final Query query = jooqFilter.build();