0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #833

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-01-12 17:40:24 +09:00
parent b51abdbde8
commit 237748c646
3 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
plugin.xml
View file

@ -15,39 +15,39 @@
<mkdir dir="${plugins.dir}" />
<!-- 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="5.0.0" />
<param name="plugin.zip.version" value="5.0.0" />
<param name="plugin.version" value="5.1.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.1.0-20170107.014639-1" />
</antcall>
<!-- analysis-ja -->
<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-ja" />
<param name="plugin.version" value="5.0.0" />
<param name="plugin.zip.version" value="5.0.0" />
<param name="plugin.version" value="5.1.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.1.0-20170107.060401-1" />
</antcall>
<!-- analysis-synonym -->
<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-synonym" />
<param name="plugin.version" value="5.0.0" />
<param name="plugin.zip.version" value="5.0.0" />
<param name="plugin.version" value="5.1.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.1.0-20170107.060016-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="5.0.0" />
<param name="plugin.zip.version" value="5.0.0" />
<param name="plugin.version" value="5.1.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.1.0-20170107.060858-1" />
</antcall>
<!-- dataformat -->
<antcall target="install.plugin">
@ -55,17 +55,17 @@
<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="5.0.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.0.0-20170105.123548-6" />
<param name="plugin.version" value="5.1.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.1.0-20170112.062445-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="5.0.0" />
<param name="plugin.zip.version" value="5.0.0" />
<param name="plugin.version" value="5.1.0-SNAPSHOT" />
<param name="plugin.zip.version" value="5.1.0-20170107.062152-1" />
</antcall>
<!-- kopf -->
<get dest="${target.dir}/kopf.zip">
@ -100,11 +100,9 @@
<include name="configsync/commons-codec-*" />
<include name="dataformat/commons-codec-*" />
<include name="dataformat/curvesapi-*" />
<include name="dataformat/netty-*" />
<include name="dataformat/orangesignal-csv-*" />
<include name="dataformat/poi-*" />
<include name="dataformat/stax-api-*" />
<include name="dataformat/transport-*" />
<include name="dataformat/xmlbeans-*" />
<include name="langfield/jackson-*" />
</fileset>

6
pom.xml
View file

@ -60,11 +60,11 @@
<crawler.version>1.1.0-SNAPSHOT</crawler.version>
<!-- Suggest -->
<suggest.version>5.0.0-SNAPSHOT</suggest.version>
<suggest.version>5.1.0-SNAPSHOT</suggest.version>
<!-- Elasticsearch -->
<elasticsearch.version>5.0.2</elasticsearch.version>
<cluster.runner.version>5.0.2.1</cluster.runner.version>
<elasticsearch.version>5.1.1</elasticsearch.version>
<cluster.runner.version>5.1.1.0</cluster.runner.version>
<!-- Tomcat -->
<tomcat.version>8.5.5</tomcat.version>

11
src/main/java/org/codelibs/fess/es/client/FessEsClient.java
View file

@ -137,7 +137,6 @@ import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.get.GetField;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.indices.IndexAlreadyExistsException;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHitField;
import org.elasticsearch.search.SearchHits;
@ -362,8 +361,6 @@ public class FessEsClient implements Client {
} else if (logger.isDebugEnabled()) {
logger.debug("Failed to create " + createdIndexName + " index.");
}
} catch (final IndexAlreadyExistsException e) {
// ignore
} catch (final Exception e) {
logger.warn(indexConfigFile + " is not found.", e);
}
@ -819,7 +816,7 @@ public class FessEsClient implements Client {
final BulkResponse response = bulkRequestBuilder.execute().actionGet(ComponentUtil.getFessConfig().getIndexBulkTimeout());
if (response.hasFailures()) {
if (logger.isDebugEnabled()) {
final List<ActionRequest<?>> requests = bulkRequestBuilder.request().requests();
final List<ActionRequest> requests = bulkRequestBuilder.request().requests();
final BulkItemResponse[] items = response.getItems();
if (requests.size() == items.length) {
for (int i = 0; i < requests.size(); i++) {
@ -1332,19 +1329,19 @@ public class FessEsClient implements Client {
}
@Override
public <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> ActionFuture<Response> execute(
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> ActionFuture<Response> execute(
Action<Request, Response, RequestBuilder> action, Request request) {
return client.execute(action, request);
}
@Override
public <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void execute(
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void execute(
Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
client.execute(action, request, listener);
}
@Override
public <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> RequestBuilder prepareExecute(
public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> RequestBuilder prepareExecute(
Action<Request, Response, RequestBuilder> action) {
return client.prepareExecute(action);
}