Bumping OpenSearch 2.7.0 -> 2.9.0

querqy · Sep 22, 2023 · 286df47 · 286df47
1 parent 0efe96d
commit 286df47
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,7 @@ opensearchplugin {
 buildscript {
 
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "2.7.0")
+        opensearch_version = System.getProperty("opensearch.version", "2.9.0")
     }
 
     repositories {
@@ -83,8 +83,8 @@ allprojects {
 dependencies {
     api('org.querqy:querqy-lucene:5.4.lucene900.1')
     api('com.fasterxml.jackson.core:jackson-databind')
-    api('com.fasterxml.jackson.core:jackson-core:2.14.2')
-    api('com.fasterxml.jackson.core:jackson-annotations:2.14.2')
+    api('com.fasterxml.jackson.core:jackson-core:2.15.2')
+    api('com.fasterxml.jackson.core:jackson-annotations:2.15.2')
     api('com.jayway.jsonpath:json-path:2.7.0')
     implementation("commons-io:commons-io:2.11.0")
     implementation("org.querqy:querqy-core:3.14.1")
@@ -95,7 +95,7 @@ dependencies {
 
 
     testImplementation('junit:junit:4.13.2')
-    testImplementation('org.mockito:mockito-core:5.2.0')
+    testImplementation('org.mockito:mockito-core:5.4.0')
     testImplementation('org.apache.logging.log4j:log4j-core:2.17.1')
     testImplementation('org.assertj:assertj-core:3.23.1')
 }

diff --git a/src/main/java/querqy/opensearch/rewriterstore/TransportPutRewriterAction.java b/src/main/java/querqy/opensearch/rewriterstore/TransportPutRewriterAction.java
@@ -43,7 +43,6 @@
 import org.opensearch.client.IndicesAdminClient;
 import org.opensearch.cluster.metadata.MappingMetadata;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
@@ -87,7 +86,7 @@ protected void doExecute(final Task task, final PutRewriterRequest request,
             @Override
             @SuppressWarnings("unchecked")
             public void onResponse(final GetMappingsResponse getMappingsResponse) {
-                final ImmutableOpenMap<String, MappingMetadata> mappings = getMappingsResponse.getMappings();
+                final Map<String, MappingMetadata> mappings = getMappingsResponse.getMappings();
 
                 if (!mappingsVersionChecked) {
 

diff --git a/src/test/java/querqy/opensearch/QuerqyMappingsUpdate1To3IntegrationTest.java b/src/test/java/querqy/opensearch/QuerqyMappingsUpdate1To3IntegrationTest.java
@@ -27,9 +27,7 @@
 import org.opensearch.action.admin.indices.mapping.get.GetMappingsRequest;
 import org.opensearch.client.IndicesAdminClient;
 import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchSingleNodeTestCase;
@@ -96,7 +94,7 @@ public void testUpdate1To3() throws Exception {
         client().execute(PutRewriterAction.INSTANCE, new PutRewriterRequest("common_rules", content)).get();
 
         final GetMappingsRequest getMappingsRequest = new GetMappingsRequest().indices(QUERQY_INDEX_NAME);
-        final ImmutableOpenMap<String, MappingMetadata> mappings = indicesClient
+        final Map<String, MappingMetadata> mappings = indicesClient
                 .getMappings(getMappingsRequest).get().getMappings();
         final Map<String, Object> properties = (Map<String, Object>) mappings.get(QUERQY_INDEX_NAME)
                 .getSourceAsMap().get("properties");

diff --git a/src/test/java/querqy/opensearch/QuerqyMappingsUpdate2To3IntegrationTest.java b/src/test/java/querqy/opensearch/QuerqyMappingsUpdate2To3IntegrationTest.java
@@ -27,9 +27,7 @@
 import org.opensearch.action.admin.indices.mapping.get.GetMappingsRequest;
 import org.opensearch.client.IndicesAdminClient;
 import org.opensearch.cluster.metadata.MappingMetadata;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchSingleNodeTestCase;
@@ -101,7 +99,7 @@ public void testUpdate2To3() throws Exception {
         client().execute(PutRewriterAction.INSTANCE, new PutRewriterRequest("common_rules", content)).get();
 
         final GetMappingsRequest getMappingsRequest = new GetMappingsRequest().indices(QUERQY_INDEX_NAME);
-        final ImmutableOpenMap<String, MappingMetadata> mappings = indicesClient
+        final Map<String, MappingMetadata> mappings = indicesClient
                 .getMappings(getMappingsRequest).get().getMappings();
         final Map<String, Object> properties = (Map<String, Object>) mappings.get(QUERQY_INDEX_NAME)
                 .getSourceAsMap().get("properties");