UNOMI-901: Upgrade elasticsearch client by jsinovassin · Pull Request #729 · apache/unomi

jsinovassin · 2025-09-09T13:22:13Z

This pull request introduces several notable improvements and updates across the codebase, primarily focusing on support for Elasticsearch 9, and documentation enhancements. The most significant changes include the addition of new dependencies for Elasticsearch 9, updates of the test snapshots, and the removal of deprecated API methods. There are also minor improvements to JavaDoc formatting and test adjustments.

Elasticsearch 9 Support and Dependency Updates:

Added new dependencies for unomi-persistence-elasticsearch-core in bom/artifacts/pom.xml and updated the corresponding dependency in kar/pom.xml to enable Elasticsearch 9 support.
Updated bom/pom.xml to add dependencies for the new Elasticsearch Java client (elasticsearch-java) and to ensure compatibility by specifying both old and new Elasticsearch versions for different modules.
Upgraded the elasticsearch-maven-plugin version in itests/pom.xml for improved compatibility.

Test and Snapshot Updates:

Updated test logic and documentation in itests/README.md and related test files to use snapshot_2 instead of the older snapshot_1.6.x, reflecting a newer baseline for migration testing.

API and Codebase Clean-up:

Removal of deprecated methods and of unused methods

Documentation:

Minor Code Improvements:

Simplified Java code by using diamond operator (<>) for generics in Condition.java.
Minor documentation and whitespace clean-up in various POM and Java files.
Removal of configuration related to monthly indices, rollover configuration should be used now

These changes collectively modernize the project’s dependencies, improve migration test robustness, and enhance code maintainability and documentation clarity.

jayblanc · 2025-09-12T13:10:54Z

persistence-elasticsearch/conditions/pom.xml

+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.12.7</version>


This is already present Unomi BOM and version in Unomi Parent pom.xml, version is not needed.
Also dependencies are grouped with a logic :

unomi modules dependencies are on top

embedded dependencies are grouped after

provided dependencies then

test dependencies finally.
It's better to move each dependency accordingly to keep an easier reading approach.

jayblanc · 2025-09-12T13:12:18Z

persistence-elasticsearch/conditions/pom.xml

+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>


Guava version is already setup in the BOM so version is not needed here.
It is also included in the feature so it should be flagged as provided.
Anyway, Guava is a huge dependency we tried to remove in other project/module.
If another option is possible, it's better to remove guava. I don't see direct usage but maybe a library is using it...

jayblanc · 2025-09-12T13:13:05Z

persistence-elasticsearch/conditions/pom.xml

+            <artifactId>hazelcast-all</artifactId>
+            <version>3.12.8</version>
+            <scope>provided</scope>
+        </dependency>


Did you try to remove hazelcast dependency.
Maybe with ES 9 client it is no more needed. If yes, remove it but also from BOM and parent.

jayblanc · 2025-09-12T13:16:20Z

itests/pom.xml

                                    <path.repo>${project.build.directory}/snapshots_repository</path.repo>
                                    <cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
-                                    <http.cors.allow-origin>*</http.cors.allow-origin>
+                                    <!--http.cors.allow-origin>*</http.cors.allow-origin-->


Is it commented for test or because it is no more needed.
Maybe we can remove it if no more needed.

jayblanc · 2025-09-12T13:16:59Z

itests/src/test/java/org/apache/unomi/itests/SegmentIT.java

        try {
            Map<String, Object> pastEvent = ((List<Map<String, Object>>)testEvent.getProfile().getSystemProperties().get("pastEvents")).stream().filter(profilePastEvent -> profilePastEvent.get("key").equals(pastEventCondition.getParameterValues().get("generatedPropertyKey"))).findFirst().get();
-            Assert.assertEquals("Profile should have 2 events in the scoring", 2, (long) pastEvent.get("count"));
+            Assert. assertEquals("Profile should have 2 events in the scoring", 2, (long) pastEvent.get("count"));


It seems that space is not wanted

jayblanc · 2025-09-12T14:33:08Z

persistence-spi/pom.xml

+            <groupId>org.apache.unomi</groupId>
+            <artifactId>unomi-metrics</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>


unomi module dependencies should be placed on top of dependency section and version is not necessary because included by BOM, if not, add module in BOM to avoid specifying version here.

jayblanc · 2025-09-12T14:36:20Z

persistence-elasticsearch/core/pom.xml

+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-client</artifactId>
+        </dependency>


Maybe we can remove hazelcast from here too.

jayblanc · 2025-09-12T14:41:06Z

...persistence/elasticsearch/querybuilders/core/SourceEventPropertyConditionESQueryBuilder.java

    }

-    private void appendFilderIfPropExist(List<QueryBuilder> queryBuilders, Condition condition, String prop){
+    private void appendFilderIfPropExist(List<Query> queryBuilders, Condition condition, String prop) {


maybe queryBuilders could be renamed queries as now there is no more QueryBuilder.

jayblanc · 2025-09-12T14:41:27Z

...persistence/elasticsearch/querybuilders/core/SourceEventPropertyConditionESQueryBuilder.java

-        for (String prop : new String[]{"id", "path", "scope", "type"}){
+    public Query buildQuery(Condition condition, Map<String, Object> context, ConditionESQueryBuilderDispatcher dispatcher) {
+        List<Query> queryBuilders = new ArrayList<Query>();
+        for (String prop : new String[]{"id", "path", "scope", "type"}) {


Same renaming here queryBuilders -> queries

jayblanc · 2025-09-12T14:42:06Z

...persistence/elasticsearch/querybuilders/core/SourceEventPropertyConditionESQueryBuilder.java

-                for (QueryBuilder queryBuilder : queryBuilders) {
+                BoolQuery.Builder boolQueryBuilder = new BoolQuery.Builder();
+                for (Query queryBuilder : queryBuilders) {
                    boolQueryBuilder.must(queryBuilder);


and queryBuilder -> query

jsinovassin added 3 commits September 8, 2025 15:10

feat: upgrade elasticsearch client to version 9

eb03795

test: fix it tests

45ebfa3

update snapshot name

c0d09c2

jsinovassin force-pushed the upgrade-es-client branch from 366094f to c0d09c2 Compare September 9, 2025 15:25

jsinovassin added 2 commits September 10, 2025 16:57

fix test

d13f806

rename elasticsearch-9 to elasticsearch

600a452

jsinovassin force-pushed the upgrade-es-client branch from df8c02e to 600a452 Compare September 11, 2025 07:16

use keyword

e75dbc8

jsinovassin force-pushed the upgrade-es-client branch from 5a1bb1b to e75dbc8 Compare September 11, 2025 12:06

remove keyword usage

fbd6c96

jsinovassin force-pushed the upgrade-es-client branch 2 times, most recently from 51c2d8b to 065c931 Compare September 12, 2025 08:32

fix tests

b3f53b6

jsinovassin force-pushed the upgrade-es-client branch from 065c931 to b3f53b6 Compare September 12, 2025 08:33

remove unwanted modification

0778332

jayblanc requested changes Sep 12, 2025

View reviewed changes

feedback

f18a173

jayblanc approved these changes Sep 15, 2025

View reviewed changes

jsinovassin merged commit d3d2d16 into master Sep 15, 2025
5 checks passed

jsinovassin deleted the upgrade-es-client branch September 15, 2025 11:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UNOMI-901: Upgrade elasticsearch client#729

UNOMI-901: Upgrade elasticsearch client#729
jsinovassin merged 10 commits intomasterfrom
upgrade-es-client

jsinovassin commented Sep 9, 2025 •

edited

Loading

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

jayblanc Sep 12, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

jsinovassin commented Sep 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jsinovassin commented Sep 9, 2025 •

edited

Loading