From 3f9aa4f5c73f6763453c7f410a1ae88a260ec490 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Sat, 17 Nov 2018 14:05:12 +0900
Subject: [PATCH] elasticsearch 6.5.0
---
dbflute.xml | 2 +-
plugin.xml | 42 +++++++++----------
pom.xml | 6 +--
.../codelibs/fess/es/client/FessEsClient.java | 11 +++--
.../org/codelibs/fess/util/UpgradeUtil.java | 18 ++++----
5 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/dbflute.xml b/dbflute.xml
index eee44fe84..2ebb6004c 100644
--- a/dbflute.xml
+++ b/dbflute.xml
@@ -2,7 +2,7 @@
<project name="dbflute" basedir=".">
<property name="mydbflute.dir" value="${basedir}/mydbflute" />
<property name="target.dir" value="${basedir}/target" />
- <property name="branch.name" value="es-6.4" />
+ <property name="branch.name" value="es-6.5" />
<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
<target name="mydbflute.check">
diff --git a/plugin.xml b/plugin.xml
index 122cfc4af..0d1f009e7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -13,66 +13,66 @@
<mkdir dir="${plugins.dir}" />
<!-- analysis-extension -->
<antcall target="install.plugin">
- <param name="repo.url" value="${maven.release.repo.url}" />
+ <param name="repo.url" value="${maven.snapshot.repo.url}" />
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="analysis-extension" />
- <param name="plugin.version" value="6.4.0" />
- <param name="plugin.zip.version" value="6.4.0" />
+ <param name="plugin.version" value="6.5.0-SNAPSHOT" />
+ <param name="plugin.zip.version" value="6.5.0-20181115.212551-2" />
</antcall>
<!-- analysis-fess -->
<antcall target="install.plugin">
- <param name="repo.url" value="${maven.release.repo.url}" />
+ <param name="repo.url" value="${maven.snapshot.repo.url}" />
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="analysis-fess" />
- <param name="plugin.version" value="6.4.0" />
- <param name="plugin.zip.version" value="6.4.0" />
+ <param name="plugin.version" value="6.5.0-SNAPSHOT" />
+ <param name="plugin.zip.version" value="6.5.0-20181115.212746-1" />
</antcall>
<!-- configsync -->
<antcall target="install.plugin">
- <param name="repo.url" value="${maven.release.repo.url}" />
+ <param name="repo.url" value="${maven.snapshot.repo.url}" />
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="configsync" />
- <param name="plugin.version" value="6.4.0" />
- <param name="plugin.zip.version" value="6.4.0" />
+ <param name="plugin.version" value="6.5.0-SNAPSHOT" />
+ <param name="plugin.zip.version" value="6.5.0-20181115.133917-1" />
</antcall>
<!-- dataformat -->
<antcall target="install.plugin">
- <param name="repo.url" value="${maven.release.repo.url}" />
+ <param name="repo.url" value="${maven.snapshot.repo.url}" />
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="dataformat" />
- <param name="plugin.version" value="6.4.0" />
- <param name="plugin.zip.version" value="6.4.0" />
+ <param name="plugin.version" value="6.5.0-SNAPSHOT" />
+ <param name="plugin.zip.version" value="6.5.0-20181115.134048-1" />
</antcall>
<!-- langfield -->
<antcall target="install.plugin">
- <param name="repo.url" value="${maven.release.repo.url}" />
+ <param name="repo.url" value="${maven.snapshot.repo.url}" />
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="langfield" />
- <param name="plugin.version" value="6.4.1" />
- <param name="plugin.zip.version" value="6.4.1" />
+ <param name="plugin.version" value="6.5.0-SNAPSHOT" />
+ <param name="plugin.zip.version" value="6.5.0-20181116.132224-1" />
</antcall>
<!-- learning-to-rank -->
<antcall target="install.plugin">
- <param name="repo.url" value="${maven.release.repo.url}" />
+ <param name="repo.url" value="${maven.snapshot.repo.url}" />
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="learning-to-rank" />
- <param name="plugin.version" value="6.4.0" />
- <param name="plugin.zip.version" value="6.4.0" />
+ <param name="plugin.version" value="6.5.0-SNAPSHOT" />
+ <param name="plugin.zip.version" value="6.5.0-20181117.042241-1" />
</antcall>
<!-- minhash -->
<antcall target="install.plugin">
- <param name="repo.url" value="${maven.release.repo.url}" />
+ <param name="repo.url" value="${maven.snapshot.repo.url}" />
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="minhash" />
- <param name="plugin.version" value="6.4.0" />
- <param name="plugin.zip.version" value="6.4.0" />
+ <param name="plugin.version" value="6.5.0-SNAPSHOT" />
+ <param name="plugin.zip.version" value="6.5.0-20181115.134303-1" />
</antcall>
<antcall target="remove.jars" />
diff --git a/pom.xml b/pom.xml
index a5d70a038..c464ca071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,11 +63,11 @@
<crawler.version>3.0.0-SNAPSHOT</crawler.version>
<!-- Suggest -->
- <suggest.version>6.4.3-SNAPSHOT</suggest.version>
+ <suggest.version>6.5.0-SNAPSHOT</suggest.version>
<!-- Elasticsearch -->
- <elasticsearch.version>6.4.3</elasticsearch.version>
- <elasticsearch.httpclient.version>6.4.0-SNAPSHOT</elasticsearch.httpclient.version>
+ <elasticsearch.version>6.5.0</elasticsearch.version>
+ <elasticsearch.httpclient.version>6.5.0-SNAPSHOT</elasticsearch.httpclient.version>
<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
<!-- Tomcat -->
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index 15de6f6b5..01c874a03 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -76,13 +76,11 @@ import org.elasticsearch.action.DocWriteRequest.OpType;
import org.elasticsearch.action.DocWriteResponse.Result;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
-import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
import org.elasticsearch.action.admin.indices.flush.FlushResponse;
import org.elasticsearch.action.admin.indices.get.GetIndexResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
import org.elasticsearch.action.bulk.BulkItemResponse;
import org.elasticsearch.action.bulk.BulkItemResponse.Failure;
@@ -120,6 +118,7 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchScrollRequest;
import org.elasticsearch.action.search.SearchScrollRequestBuilder;
import org.elasticsearch.action.support.WriteRequest.RefreshPolicy;
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
import org.elasticsearch.action.termvectors.MultiTermVectorsRequestBuilder;
import org.elasticsearch.action.termvectors.MultiTermVectorsResponse;
@@ -407,7 +406,7 @@ public class FessEsClient implements Client {
logger.warn(mappingFile + " is not found.", e);
}
try {
- final PutMappingResponse putMappingResponse =
+ final AcknowledgedResponse putMappingResponse =
client.admin().indices().preparePutMapping(indexName).setType(docType).setSource(source, XContentType.JSON)
.execute().actionGet(fessConfig.getIndexIndicesTimeout());
if (putMappingResponse.isAcknowledged()) {
@@ -447,7 +446,7 @@ public class FessEsClient implements Client {
for (final String index : searchIndices) {
builder.removeAlias(index, searchAlias);
}
- final IndicesAliasesResponse response = builder.execute().actionGet(fessConfig.getIndexIndicesTimeout());
+ final AcknowledgedResponse response = builder.execute().actionGet(fessConfig.getIndexIndicesTimeout());
return response.isAcknowledged();
}
@@ -465,7 +464,7 @@ public class FessEsClient implements Client {
if (source.trim().equals("{}")) {
source = null;
}
- final IndicesAliasesResponse response =
+ final AcknowledgedResponse response =
client.admin().indices().prepareAliases().addAlias(createdIndexName, aliasName, source).execute()
.actionGet(fessConfig.getIndexIndicesTimeout());
if (response.isAcknowledged()) {
@@ -914,7 +913,7 @@ public class FessEsClient implements Client {
if (response.hasFailures()) {
if (logger.isDebugEnabled()) {
@SuppressWarnings("rawtypes")
- final List<DocWriteRequest> requests = bulkRequestBuilder.request().requests();
+ final List<DocWriteRequest<?>> requests = bulkRequestBuilder.request().requests();
final BulkItemResponse[] items = response.getItems();
if (requests.size() == items.length) {
for (int i = 0; i < requests.size(); i++) {
diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
index f13ab104a..053fc2226 100644
--- a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
+++ b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
@@ -23,15 +23,13 @@ import org.codelibs.core.io.FileUtil;
import org.codelibs.curl.CurlResponse;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData;
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.IndicesAdminClient;
import org.elasticsearch.cluster.metadata.MappingMetaData;
@@ -72,7 +70,7 @@ public final class UpgradeUtil {
final File aliasConfigFile = org.codelibs.core.io.ResourceUtil.getResourceAsFile(aliasConfigPath);
if (aliasConfigFile.exists()) {
final String source = FileUtil.readUTF8(aliasConfigFile);
- final IndicesAliasesResponse response =
+ final AcknowledgedResponse response =
indicesClient.prepareAliases().addAlias(indexName, aliasName, source).execute()
.actionGet(fessConfig.getIndexIndicesTimeout());
if (response.isAcknowledged()) {
@@ -105,7 +103,7 @@ public final class UpgradeUtil {
logger.warn(mappingFile + " is not found.", e);
}
try {
- final PutMappingResponse putMappingResponse =
+ final AcknowledgedResponse putMappingResponse =
indicesClient.preparePutMapping(index).setType(type).setSource(source, XContentType.JSON).execute()
.actionGet(fessConfig.getIndexIndicesTimeout());
if (putMappingResponse.isAcknowledged()) {
@@ -129,7 +127,7 @@ public final class UpgradeUtil {
final FieldMappingMetaData fieldMappings = gfmResponse.fieldMappings(index, type, field);
if (fieldMappings == null || fieldMappings.isNull()) {
try {
- final PutMappingResponse pmResponse =
+ final AcknowledgedResponse pmResponse =
indicesClient.preparePutMapping(index).setType(type).setSource(source, XContentType.JSON).execute().actionGet();
if (!pmResponse.isAcknowledged()) {
logger.warn("Failed to add " + field + " to " + index + "/" + type);
@@ -153,7 +151,7 @@ public final class UpgradeUtil {
if (type != null) {
builder.setType(type);
}
- final PutMappingResponse pmResponse = builder.execute().actionGet();
+ final AcknowledgedResponse pmResponse = builder.execute().actionGet();
if (!pmResponse.isAcknowledged()) {
logger.warn("Failed to update " + index + " settings.");
} else {
@@ -191,11 +189,11 @@ public final class UpgradeUtil {
return false;
}
- public static void deleteIndex(final IndicesAdminClient indicesClient, final String index, final Consumer<DeleteIndexResponse> comsumer) {
- indicesClient.prepareDelete(index).execute(new ActionListener<DeleteIndexResponse>() {
+ public static void deleteIndex(final IndicesAdminClient indicesClient, final String index, final Consumer<AcknowledgedResponse> comsumer) {
+ indicesClient.prepareDelete(index).execute(new ActionListener<AcknowledgedResponse>() {
@Override
- public void onResponse(final DeleteIndexResponse response) {
+ public void onResponse(final AcknowledgedResponse response) {
logger.info("Deleted " + index + " index.");
comsumer.accept(response);
}
--
GitLab