From 44e8dc5253c53d0e1a5611212115deb550a5fe21 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Tue, 23 May 2023 16:02:12 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20groupB?= =?UTF-8?q?y=20=D0=BF=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8F=D0=BC=20=D1=81?= =?UTF-8?q?=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../struchkov/haiti/filter/quarkus/QuarkusFilter.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/dev/struchkov/haiti/filter/quarkus/QuarkusFilter.java b/src/main/java/dev/struchkov/haiti/filter/quarkus/QuarkusFilter.java index 40be8a7..b36a8aa 100644 --- a/src/main/java/dev/struchkov/haiti/filter/quarkus/QuarkusFilter.java +++ b/src/main/java/dev/struchkov/haiti/filter/quarkus/QuarkusFilter.java @@ -14,7 +14,6 @@ import org.jooq.DSLContext; import org.jooq.Query; import org.jooq.conf.ParamType; -import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.function.Consumer; @@ -30,7 +29,7 @@ public class QuarkusFilter { private final PgPool pgPool; private final CriteriaJooqFilter jooqFilter; private PageableOffset offset; - private final List sortFieldNames = new ArrayList<>(); +// private final List sortFieldNames = new ArrayList<>(); private QuarkusFilter(PgPool pgPool, String table, DSLContext dslContext) { dslContext.settings().withParamType(ParamType.NAMED_OR_INLINED); @@ -83,7 +82,7 @@ public class QuarkusFilter { public QuarkusFilter sort(SortContainer container) { if (container != null && container.getFieldName() != null) { jooqFilter.sort(container); - sortFieldNames.add(container.getFieldName()); +// sortFieldNames.add(container.getFieldName()); } return this; } @@ -91,7 +90,7 @@ public class QuarkusFilter { public QuarkusFilter sort(String field, SortType sortType) { if (field != null) { jooqFilter.sort(field, sortType); - sortFieldNames.add(field); +// sortFieldNames.add(field); } return this; } @@ -99,7 +98,7 @@ public class QuarkusFilter { public QuarkusFilter sort(String field) { if (field != null) { jooqFilter.sort(field); - sortFieldNames.add(field); +// sortFieldNames.add(field); } return this; } @@ -136,7 +135,7 @@ public class QuarkusFilter { public Uni> filterResult(Class idType, String idField) { jooqFilter.groupBy(tableName + "." + idField); - jooqFilter.groupBy(sortFieldNames); +// jooqFilter.groupBy(sortFieldNames); distinctCount = true; final Uni count = count(); final Uni> content = build(idType, idField); From a07e52df56024308bda5c399c82f174097462186 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Tue, 23 May 2023 16:03:13 +0300 Subject: [PATCH 2/5] fix v.1.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2921c95..99d943b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.haiti.filter haiti-filter-quarkus-reactive - 1.0.0 + 1.0.1 jar Haiti Filter Reactive Quarkus From aa7db91d40404c8fd41b62bcd07d89df8f3b12fa Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Thu, 11 May 2023 12:59:35 +0300 Subject: [PATCH 3/5] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 99d943b..445743c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.haiti.filter haiti-filter-quarkus-reactive - 1.0.1 + 1.0.1-SNAPSHOT jar Haiti Filter Reactive Quarkus @@ -308,7 +308,7 @@ https://github.com/haiti-projects/haiti-filter-reactive-quarkus scm:git:https://github.com/haiti-projects/haiti-filter-reactive-quarkus.git - v.1.0.0 + HEAD From 3f8987875caccfcedda8ef0cabc8cb4ff66772b7 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Tue, 23 May 2023 16:04:42 +0300 Subject: [PATCH 4/5] [maven-release-plugin] prepare release v.1.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 445743c..fead33e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.haiti.filter haiti-filter-quarkus-reactive - 1.0.1-SNAPSHOT + 1.0.1 jar Haiti Filter Reactive Quarkus @@ -308,7 +308,7 @@ https://github.com/haiti-projects/haiti-filter-reactive-quarkus scm:git:https://github.com/haiti-projects/haiti-filter-reactive-quarkus.git - HEAD + v.1.0.1 From 98ab91fb6a2350f8cebe2538b27373592efb12a3 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Tue, 23 May 2023 16:04:42 +0300 Subject: [PATCH 5/5] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fead33e..389caa4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.struchkov.haiti.filter haiti-filter-quarkus-reactive - 1.0.1 + 1.0.2-SNAPSHOT jar Haiti Filter Reactive Quarkus @@ -308,7 +308,7 @@ https://github.com/haiti-projects/haiti-filter-reactive-quarkus scm:git:https://github.com/haiti-projects/haiti-filter-reactive-quarkus.git - v.1.0.1 + HEAD