HSEARCH-4681 Add compatibility with Elasticsearch 8.4

hibernate · Aug 25, 2022 · bc948ee · bc948ee
1 parent 046bad8
commit bc948ee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.../org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java b/.../org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java
@@ -166,7 +166,7 @@ private ElasticsearchProtocolDialect createProtocolDialectElasticV7(Elasticsearc
 	}
 
 	private ElasticsearchProtocolDialect createProtocolDialectElasticV8(ElasticsearchVersion version, int minor) {
-		if ( minor > 3 ) {
+		if ( minor > 4 ) {
 			log.unknownElasticsearchVersion( version );
 		}
 		else if ( minor == 0 ) {

diff --git a/.../hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java b/.../hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java
@@ -291,7 +291,7 @@ public static List<Object[]> params() {
 						Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
 				),
 				success(
-						ElasticsearchDistributionName.ELASTIC, "8", "8.2.0",
+						ElasticsearchDistributionName.ELASTIC, "8", "8.4.0",
 						Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class
 				),
 				success(
@@ -326,14 +326,22 @@ public static List<Object[]> params() {
 						ElasticsearchDistributionName.ELASTIC, "8.3.0", "8.3.0",
 						Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class
 				),
-				successWithWarning(
+				success(
 						ElasticsearchDistributionName.ELASTIC, "8.4", "8.4.0",
 						Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class
 				),
-				successWithWarning(
+				success(
 						ElasticsearchDistributionName.ELASTIC, "8.4.0", "8.4.0",
 						Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class
 				),
+				successWithWarning(
+						ElasticsearchDistributionName.ELASTIC, "8.5", "8.5.0",
+						Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class
+				),
+				successWithWarning(
+						ElasticsearchDistributionName.ELASTIC, "8.5.0", "8.5.0",
+						Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class
+				),
 				successWithWarning(
 						ElasticsearchDistributionName.ELASTIC, "9.0.0", "9.0.0",
 						Elasticsearch8ModelDialect.class, Elasticsearch81ProtocolDialect.class