HSEARCH-4751 Add compatibility with OpenSearch 2.4

hibernate · Nov 24, 2022 · e6fe322 · e6fe322
1 parent 7a3b08f
commit e6fe322
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.../org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java b/.../org/hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactory.java
@@ -206,7 +206,7 @@ private ElasticsearchProtocolDialect createProtocolDialectOpenSearchV1(Elasticse
 	}
 
 	private ElasticsearchProtocolDialect createProtocolDialectOpenSearchV2(ElasticsearchVersion version, int minor) {
-		if ( minor > 3 ) {
+		if ( minor > 4 ) {
 			log.unknownElasticsearchVersion( version );
 		}
 		return new Elasticsearch70ProtocolDialect();

diff --git a/.../hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java b/.../hibernate/search/backend/elasticsearch/dialect/impl/ElasticsearchDialectFactoryTest.java
@@ -430,12 +430,16 @@ public static List<Object[]> params() {
 						ElasticsearchDistributionName.OPENSEARCH, "2.3.0", "2.3.0",
 						Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
 				),
+				success(
+						ElasticsearchDistributionName.OPENSEARCH, "2.4.0", "2.4.0",
+						Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
+				),
 				successWithWarning(
-						ElasticsearchDistributionName.OPENSEARCH, "2.4", "2.4.0",
+						ElasticsearchDistributionName.OPENSEARCH, "2.5", "2.5.0",
 						Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
 				),
 				successWithWarning(
-						ElasticsearchDistributionName.OPENSEARCH, "2.4.0", "2.4.0",
+						ElasticsearchDistributionName.OPENSEARCH, "2.5.0", "2.5.0",
 						Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
 				),
 				successWithWarning(