opensearch 2.10.0

module.xml

@@ -6,7 +6,7 @@
 	<!-- Maven Repository -->
 	<property name="maven.snapshot.repo.url" value="https://maven.codelibs.org/" />
 	<property name="maven.release.repo.url" value="https://maven.codelibs.org/" />
-	<property name="opensearch.version" value="2.9.0" />
+	<property name="opensearch.version" value="2.10.0" />
 
 	<target name="install.modules">
 		<mkdir dir="${target.dir}" />

plugin.xml

@@ -17,8 +17,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-extension" />
-			<param name="plugin.version" value="2.9.0" />
-			<param name="plugin.zip.version" value="2.9.0" />
+			<param name="plugin.version" value="2.10.0" />
+			<param name="plugin.zip.version" value="2.10.0" />
 		</antcall>
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
@@ -26,8 +26,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="2.9.0" />
-			<param name="plugin.zip.version" value="2.9.0" />
+			<param name="plugin.version" value="2.10.0" />
+			<param name="plugin.zip.version" value="2.10.0" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
@@ -35,8 +35,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="2.9.0" />
-			<param name="plugin.zip.version" value="2.9.0" />
+			<param name="plugin.version" value="2.10.0" />
+			<param name="plugin.zip.version" value="2.10.0" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
@@ -44,8 +44,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="minhash" />
-			<param name="plugin.version" value="2.9.0" />
-			<param name="plugin.zip.version" value="2.9.0" />
+			<param name="plugin.version" value="2.10.0" />
+			<param name="plugin.zip.version" value="2.10.0" />
 		</antcall>
 
 		<antcall target="remove.jars" />

src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java

@@ -47,7 +47,7 @@ import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.ActionResponse;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;
-import org.opensearch.action.ActionListener;
+import org.opensearch.core.action.ActionListener;
 
 public class AdminMaintenanceAction extends FessAdminAction {
 

src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java

@@ -18,7 +18,7 @@ package org.codelibs.fess.es.client;
 import static org.codelibs.core.stream.StreamUtil.split;
 import static org.codelibs.core.stream.StreamUtil.stream;
 import static org.codelibs.opensearch.runner.OpenSearchRunner.newConfigs;
-import static org.opensearch.action.ActionListener.wrap;
+import static org.opensearch.core.action.ActionListener.wrap;
 
 import java.io.File;
 import java.io.IOException;
@@ -84,10 +84,7 @@ import org.lastaflute.core.message.UserMessages;
 import org.lastaflute.di.exception.ContainerInitFailureException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.OpenSearchStatusException;
-import org.opensearch.action.ActionFuture;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.ActionRequest;
-import org.opensearch.action.ActionResponse;
 import org.opensearch.action.ActionType;
 import org.opensearch.action.DocWriteRequest;
 import org.opensearch.action.DocWriteRequest.OpType;
@@ -157,16 +154,19 @@ import org.opensearch.action.update.UpdateResponse;
 import org.opensearch.client.AdminClient;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.MappingMetadata;
+import org.opensearch.common.action.ActionFuture;
 import org.opensearch.common.document.DocumentField;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.Settings.Builder;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.action.ActionListener;
+import org.opensearch.core.action.ActionResponse;
+import org.opensearch.core.rest.RestStatus;
 import org.opensearch.index.query.InnerHitBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.reindex.UpdateByQueryRequest;
-import org.opensearch.rest.RestStatus;
 import org.opensearch.script.Script;
 import org.opensearch.script.ScriptType;
 import org.opensearch.search.SearchHit;

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java

@@ -41,7 +41,6 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.DocWriteResponse.Result;
 import org.opensearch.action.admin.indices.refresh.RefreshResponse;
 import org.opensearch.action.bulk.BulkItemResponse;
@@ -55,6 +54,7 @@ import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.update.UpdateRequestBuilder;
 import org.opensearch.client.Client;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.index.seqno.SequenceNumbers;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;

src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java

@@ -41,7 +41,6 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.DocWriteResponse.Result;
 import org.opensearch.action.admin.indices.refresh.RefreshResponse;
 import org.opensearch.action.bulk.BulkItemResponse;
@@ -55,6 +54,7 @@ import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.update.UpdateRequestBuilder;
 import org.opensearch.client.Client;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.index.seqno.SequenceNumbers;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;

src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java

@@ -21,9 +21,9 @@ import java.util.Map;
 import java.util.Objects;
 
 import org.apache.lucene.search.Query;
-import org.opensearch.common.io.stream.NamedWriteable;
-import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.ParseField;
+import org.opensearch.core.common.io.stream.NamedWriteable;
+import org.opensearch.core.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;

src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java

@@ -41,7 +41,6 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.DocWriteResponse.Result;
 import org.opensearch.action.admin.indices.refresh.RefreshResponse;
 import org.opensearch.action.bulk.BulkItemResponse;
@@ -55,6 +54,7 @@ import org.opensearch.action.search.SearchRequestBuilder;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.update.UpdateRequestBuilder;
 import org.opensearch.client.Client;
+import org.opensearch.core.action.ActionListener;
 import org.opensearch.index.seqno.SequenceNumbers;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;

src/main/java/org/codelibs/fess/helper/ViewHelper.java

@@ -85,7 +85,7 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;
 import org.lastaflute.web.util.LaServletContextUtil;
-import org.opensearch.common.text.Text;
+import org.opensearch.core.common.text.Text;
 import org.opensearch.search.fetch.subphase.highlight.HighlightField;
 
 import com.github.jknack.handlebars.Context;

src/main/java/org/codelibs/fess/util/SearchEngineUtil.java

@@ -24,11 +24,10 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.es.client.SearchEngineClient;
 import org.lastaflute.di.exception.IORuntimeException;
-import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentHelper;
-import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentHelper;
 import org.opensearch.search.SearchHit;
 
 public final class SearchEngineUtil {
@@ -38,8 +37,8 @@ public final class SearchEngineUtil {
     private SearchEngineUtil() {
     }
 
-    public static OutputStream getXContentBuilderOutputStream(final XContentBuilderCallback func, final XContentType xContentType) {
-        try (final XContentBuilder builder = func.apply(XContentFactory.contentBuilder(xContentType), ToXContent.EMPTY_PARAMS)) {
+    public static OutputStream getXContentBuilderOutputStream(final XContentBuilderCallback func, final MediaType mediaType) {
+        try (final XContentBuilder builder = func.apply(mediaType.contentBuilder(), ToXContent.EMPTY_PARAMS)) {
             builder.flush();
             return builder.getOutputStream();
         } catch (final IOException e) {
@@ -50,8 +49,8 @@ public final class SearchEngineUtil {
         }
     }
 
-    public static OutputStream getXContentOutputStream(final ToXContent xContent, final XContentType xContentType) {
-        return getXContentBuilderOutputStream((builder, params) -> xContent.toXContent(builder, params), xContentType);
+    public static OutputStream getXContentOutputStream(final ToXContent xContent, final MediaType mediaType) {
+        return getXContentBuilderOutputStream((builder, params) -> xContent.toXContent(builder, params), mediaType);
     }
 
     public static long scroll(final String index, final Function<SearchHit, Boolean> callback) {
@@ -60,9 +59,9 @@ public final class SearchEngineUtil {
                 hit -> callback.apply(hit));
     }
 
-    public static String getXContentString(final ToXContent xContent, final XContentType xContentType) {
+    public static String getXContentString(final ToXContent xContent, final MediaType mediaType) {
         try {
-            return XContentHelper.toXContent(xContent, xContentType, ToXContent.EMPTY_PARAMS, false).utf8ToString();
+            return XContentHelper.toXContent(xContent, mediaType, ToXContent.EMPTY_PARAMS, false).utf8ToString();
         } catch (final IOException e) {
             throw new IORuntimeException(e);
         }

src/main/java/org/codelibs/fess/util/UpgradeUtil.java

@@ -25,7 +25,6 @@ import org.codelibs.core.exception.ResourceNotFoundRuntimeException;
 import org.codelibs.core.io.FileUtil;
 import org.codelibs.curl.CurlResponse;
 import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.opensearch.action.ActionListener;
 import org.opensearch.action.admin.indices.exists.indices.IndicesExistsResponse;
 import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
 import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
@@ -37,6 +36,7 @@ import org.opensearch.client.Client;
 import org.opensearch.client.IndicesAdminClient;
 import org.opensearch.cluster.metadata.MappingMetadata;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.action.ActionListener;
 
 public final class UpgradeUtil {
     private static final Logger logger = LogManager.getLogger(UpgradeUtil.class);