HSEARCH-4850 Add compatibility with OpenSearch 2.7

hibernate · May 3, 2023 · 47f0ac6 · 47f0ac6
1 parent 2c31120
commit 47f0ac6
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 > 6 ) {
+		if ( minor > 7 ) {
 			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
@@ -458,12 +458,16 @@ public static List<Object[]> params() {
 						ElasticsearchDistributionName.OPENSEARCH, "2.6.0", "2.6.0",
 						Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
 				),
+				success(
+						ElasticsearchDistributionName.OPENSEARCH, "2.7.0", "2.7.0",
+						Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
+				),
 				successWithWarning(
-						ElasticsearchDistributionName.OPENSEARCH, "2.7", "2.7.0",
+						ElasticsearchDistributionName.OPENSEARCH, "2.8", "2.8.0",
 						Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
 				),
 				successWithWarning(
-						ElasticsearchDistributionName.OPENSEARCH, "2.7.0", "2.7.0",
+						ElasticsearchDistributionName.OPENSEARCH, "2.8.0", "2.8.0",
 						Elasticsearch7ModelDialect.class, Elasticsearch70ProtocolDialect.class
 				),
 				successWithWarning(