Skip to content

Commit fa32c2e

Browse files
committed
HSEARCH-5361 Add Elasticsearch 9.0.0 compatibility
1 parent 8c589c3 commit fa32c2e

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@ else if ( major == 7 ) {
182182
else if ( major == 8 ) {
183183
return createProtocolDialectElasticV8( version, minor );
184184
}
185+
else if ( major == 9 ) {
186+
return createProtocolDialectElasticV9( version, minor );
187+
}
185188
else {
186189
VersionLog.INSTANCE.unknownElasticsearchVersion( version );
187190
return new Elasticsearch81ProtocolDialect();
@@ -205,6 +208,13 @@ else if ( minor == 0 ) {
205208
return new Elasticsearch81ProtocolDialect();
206209
}
207210

211+
private ElasticsearchProtocolDialect createProtocolDialectElasticV9(ElasticsearchVersion version, int minor) {
212+
if ( minor > 0 ) {
213+
VersionLog.INSTANCE.unknownElasticsearchVersion( version );
214+
}
215+
return new Elasticsearch81ProtocolDialect();
216+
}
217+
208218
private ElasticsearchProtocolDialect createProtocolDialectOpenSearch(ElasticsearchVersion version) {
209219
OptionalInt majorOptional = version.majorOptional();
210220
OptionalInt minorOptional = version.minor();

backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,14 @@ public static List<? extends Arguments> params() {
289289
ElasticsearchDistributionName.ELASTIC, "8.17.0", "8.17.0",
290290
Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
291291
),
292+
success(
293+
ElasticsearchDistributionName.ELASTIC, "9.0", "9.0.0",
294+
Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
295+
),
296+
success(
297+
ElasticsearchDistributionName.ELASTIC, "9.0.0", "9.0.0",
298+
Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
299+
),
292300
successWithWarning(
293301
ElasticsearchDistributionName.ELASTIC, "8.18", "8.18.0",
294302
Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
@@ -298,7 +306,7 @@ public static List<? extends Arguments> params() {
298306
Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
299307
),
300308
successWithWarning(
301-
ElasticsearchDistributionName.ELASTIC, "9.0.0", "9.0.0",
309+
ElasticsearchDistributionName.ELASTIC, "9.1.0", "9.1.0",
302310
Elasticsearch814ModelDialect.class, Elasticsearch81ProtocolDialect.class
303311
),
304312
success(

build/parents/build/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<version.org.elasticsearch.compatible.regularly-tested.text>7.10, 7.17 or 8.17</version.org.elasticsearch.compatible.regularly-tested.text>
6161
<!-- These are the versions same as above, but pointing only to the major part (used in compatibility section of ES backend documentation
6262
as versions that Hibernate Search is compatible with. -->
63-
<!-- NOTE: Adding new major versions would require to update the compatibility table in `backend-elasticsearch-compatibility` section of `backend-elasticsearch.asciidoc`. -->
64-
<version.org.elasticsearch.compatible.expected.text>7.10+ or 8.x</version.org.elasticsearch.compatible.expected.text>
63+
<!-- NOTE: Adding new major versions would require to update the compatibility table in `backend-elasticsearch-compatibility` section of `backend-elasticsearch.adoc`. -->
64+
<version.org.elasticsearch.compatible.expected.text>7.10+, 8.x or 9.x</version.org.elasticsearch.compatible.expected.text>
6565
<!-- The versions of Elasticsearch that may work, but are not given priority for bugfixes and new features -->
6666
<version.org.elasticsearch.compatible.not-regularly-tested.text>7.11 or 8.0</version.org.elasticsearch.compatible.not-regularly-tested.text>
6767
<!--

0 commit comments

Comments
 (0)