This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new a92a61d440 Upgrading Elasticsearch and OpenSearch
a92a61d440 is described below
commit a92a61d4400af88460a7c2700665af310fa5624e
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Fri Aug 9 12:00:00 2024 +0200
Upgrading Elasticsearch and OpenSearch
---
.../jpa/dao/ElasticsearchAnySearchDAO.java | 21 +++++++++++++--------
.../jpa/dao/ElasticsearchAuditConfDAO.java | 14 +++++++-------
.../persistence/jpa/dao/ElasticsearchRealmDAO.java | 4 ++--
pom.xml | 4 ++--
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
index 13d63e007e..0d7163a1b0 100644
---
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
+++
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
@@ -28,6 +28,7 @@ import
co.elastic.clients.elasticsearch._types.query_dsl.BoolQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.DisMaxQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
+import co.elastic.clients.elasticsearch._types.query_dsl.RangeQuery;
import co.elastic.clients.elasticsearch.core.CountRequest;
import co.elastic.clients.elasticsearch.core.SearchRequest;
import co.elastic.clients.elasticsearch.core.search.Hit;
@@ -585,26 +586,30 @@ public class ElasticsearchAnySearchDAO extends
AbstractAnySearchDAO {
break;
case GE:
- query = new Query.Builder().range(QueryBuilders.range().
-
field(schema.getKey()).gte(JsonData.of(value)).build()).
+ query = new Query.Builder().range(RangeQuery.of(r ->
r.untyped(n -> n.
+ field(schema.getKey()).
+ gte(JsonData.of(value))))).
build();
break;
case GT:
- query = new Query.Builder().range(QueryBuilders.range().
- field(schema.getKey()).gt(JsonData.of(value)).build()).
+ query = new Query.Builder().range(RangeQuery.of(r ->
r.untyped(n -> n.
+ field(schema.getKey()).
+ gt(JsonData.of(value))))).
build();
break;
case LE:
- query = new Query.Builder().range(QueryBuilders.range().
-
field(schema.getKey()).lte(JsonData.of(value)).build()).
+ query = new Query.Builder().range(RangeQuery.of(r ->
r.untyped(n -> n.
+ field(schema.getKey()).
+ lte(JsonData.of(value))))).
build();
break;
case LT:
- query = new Query.Builder().range(QueryBuilders.range().
- field(schema.getKey()).lt(JsonData.of(value)).build()).
+ query = new Query.Builder().range(RangeQuery.of(r ->
r.untyped(n -> n.
+ field(schema.getKey()).
+ lt(JsonData.of(value))))).
build();
break;
diff --git
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java
index 60d7cc0e01..14fe873f62 100644
---
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java
+++
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAuditConfDAO.java
@@ -25,11 +25,11 @@ import co.elastic.clients.elasticsearch._types.SortOptions;
import co.elastic.clients.elasticsearch._types.SortOrder;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
+import co.elastic.clients.elasticsearch._types.query_dsl.RangeQuery;
import co.elastic.clients.elasticsearch._types.query_dsl.TextQueryType;
import co.elastic.clients.elasticsearch.core.CountRequest;
import co.elastic.clients.elasticsearch.core.SearchRequest;
import co.elastic.clients.elasticsearch.core.search.Hit;
-import co.elastic.clients.json.JsonData;
import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.IOException;
import java.time.OffsetDateTime;
@@ -110,16 +110,16 @@ public class ElasticsearchAuditConfDAO extends
JPAAuditConfDAO {
}
if (before != null) {
- queries.add(new Query.Builder().
- range(QueryBuilders.range().
-
field("instant").lte(JsonData.of(before.toInstant().toEpochMilli())).build()).
+ queries.add(new Query.Builder().range(RangeQuery.of(r ->
r.number(n -> n.
+ field("instant").
+
lte((Double.valueOf(before.toInstant().toEpochMilli())))))).
build());
}
if (after != null) {
- queries.add(new Query.Builder().
- range(QueryBuilders.range().
-
field("instant").gte(JsonData.of(after.toInstant().toEpochMilli())).build()).
+ queries.add(new Query.Builder().range(RangeQuery.of(r ->
r.number(n -> n.
+ field("instant").
+ gte((Double.valueOf(after.toInstant().toEpochMilli())))))).
build());
}
diff --git
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchRealmDAO.java
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchRealmDAO.java
index 9c6a97ad85..326426181d 100644
---
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchRealmDAO.java
+++
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchRealmDAO.java
@@ -46,8 +46,8 @@ public class ElasticsearchRealmDAO extends JPARealmDAO {
protected static final List<SortOptions> ES_SORT_OPTIONS_REALM = List.of(
new SortOptions.Builder().
script(s -> s.type(ScriptSortType.Number).
- script(t -> t.inline(i -> i.lang(ScriptLanguage.Painless).
- source("doc['fullPath'].value.chars().filter(ch -> ch ==
'/').count()"))).
+ script(t -> t.lang(ScriptLanguage.Painless).
+ source("doc['fullPath'].value.chars().filter(ch -> ch ==
'/').count()")).
order(SortOrder.Asc)).
build());
diff --git a/pom.xml b/pom.xml
index bc3da1b6f5..521fc0f985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,8 +430,8 @@ under the License.
<slf4j.version>1.7.36</slf4j.version>
- <elasticsearch.version>8.14.3</elasticsearch.version>
- <opensearch.version>2.15.0</opensearch.version>
+ <elasticsearch.version>8.15.0</elasticsearch.version>
+ <opensearch.version>2.16.0</opensearch.version>
<opensearch-java.version>2.13.0</opensearch-java.version>
<log4j2.version>2.22.0</log4j2.version>
